Commit 355a7422 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Minor refactor, cleanup.

parent d0b8e8b5

README.md

+19 −4
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ _A container-centric Science Platform_ 


Rosetta makes it easy to run interactive workloads on batch and remote computing systems using Docker and Singularity containers.



Rosetta licensed under the Apache License 2.0, unless otherwise specificed.





## Quickstart
@@ -58,14 +60,14 @@ Example Webapp configuraion 


### Extras



Check status (not yet fully supported)

List all running services



    # rosetta/status

    # rosetta/ps



Check status (not yet fully supported)



Run Web App unit tests (with Rosetta running)

    # rosetta/status



    ./run_webapp_unit_tests.sh





### Building errors
@@ -98,6 +100,19 @@ Note that when you edit the Django ORM model, you need to rerun the migrate the 
    $ python3 manage.py makemigrations

    $ python3 manage.py migrate

    

### Logs and testing



Run Web App unit tests (with Rosetta running)



    $ rosetta/logs webapp

    

    $ rosetta/logs webapp startup

    

    $ rosetta/logs webapp server

    

    $rosetta/tets



    

## Known issues



    SINGULARITY_TMPDIR=/...

docker-compose-dev.yml

+3 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ services: 
    hostname: webapp

    environment:

      - SAFEMODE=False

      - DJANGO_DEBUG=True

      - DJANGO_LOG_LEVEL=CRITICAL

      - ROSETTA_LOG_LEVEL=DEBUG

      #- ROSETTA_TUNNEL_HOST=
@@ -56,6 +57,7 @@ services: 
      #- DJANGO_EMAIL_APIKEY=""

      #- DJANGO_EMAIL_FROM="Rosetta Platform <notifications@rosetta.platform>"

      #- DJANGO_PUBLIC_HTTP_HOST=http://localhost:8080

      #- DJANGO_SECRET_KEY=""

    ports:

      - "8080:8080"

      - "7000-7020:7000-7020"
@@ -63,7 +65,7 @@ services: 
      - ./data_rosetta/webapp/data:/data

      - ./data_rosetta/webapp/log:/var/log/webapp

      - /var/run/docker.sock:/var/run/docker.sock

      #- ./services/webapp/code:/opt/webapp_code

      - ./services/webapp/code:/opt/code



  proxy:

    image: "rosetta/proxy"

rosetta/logs

0 → 100755
+20 −0
Original line number Diff line number Diff line 
#!/bin/bash



# Check if we are in the right place

if [ ! -d ./services ]; then

    echo "You must run this command from the project's root folder."

    exit 1

fi



if [[ $# -eq 0 ]] ; then

    echo "Please tell me which service to get logs from."

    exit 1

fi



if [[ "x$2" != "x" ]] ; then

    tail -f -n 1000 data_rosetta/$1/log/$2.log

else

    docker-compose logs -f $1    

fi

run_webapp_unit_tests.sh→rosetta/test

+0 −0

File moved.

View file

services/webapp/code/rosetta/core_app/templates/header.html

+0 −4
Original line number Diff line number Diff line
@@ -13,11 +13,7 @@ 
    <meta http-equiv="refresh" content="{{refresh}}" >

    {% endif %}



    {% if data.title %}

    <title>{{data.title}}</title>

    {% else %}

    <title>Rosetta</title>

    {% endif %}



    <!-- Bootstrap Core CSS -->

    <link href="/static/css/bootstrap-3.3.5.min.css" rel="stylesheet">