Commit e61b48d4 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Moved from "images" to "services".

parent 5c91a77a

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -15,4 +15,4 @@ __pycache__/ 
data*



# DB conf

images/webapp/db_conf.sh
 
services/webapp/db_conf.sh

README.md

+2 −2
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ Django development server is running on port 8080 of the "webapp" service. 


To enable live code changes, add or comment out the following in docker-compose.yaml under the "volumes" section of the "webapp" service:



    - ./images/webapp/code:/opt/webapp_code

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

    

This will mount the code from images/webapp/code as a volume inside the webapp container itself allowing to make immediately effective codebase edits.

This will mount the code from services/webapp/code as a volume inside the webapp container itself allowing to make immediately effective codebase edits.



Note that when you edit the Django ORM model, you need to rerun the migrate the database, either by just rerunning the webapp service:

docker-compose.yml

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ services: 
      - ./data_rosetta/webapp/data:/data

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

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

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

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

rosetta/build

+10 −10
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
set -e



# Check if we are in the right place

if [ ! -d ./images ]; then

if [ ! -d ./services ]; then

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

    exit 1

fi
@@ -28,19 +28,19 @@ fi 


if [[ "x$SERVICE" == "x" ]] ; then

    

    # Build all images

    $BUILD_COMMAND images/base -t rosetta/base

    $BUILD_COMMAND images/slurmbase -t rosetta/slurmbase

    $BUILD_COMMAND images/slurmcluster -t rosetta/slurmcluster    

    $BUILD_COMMAND images/slurmclustermaster -t rosetta/slurmclustermaster    

    $BUILD_COMMAND images/slurmclusterworker -t rosetta/slurmclusterworker    

    $BUILD_COMMAND images/dregistry -t rosetta/dregistry

    $BUILD_COMMAND images/webapp -t rosetta/webapp

    # Build all services

    $BUILD_COMMAND services/base -t rosetta/base

    $BUILD_COMMAND services/slurmbase -t rosetta/slurmbase

    $BUILD_COMMAND services/slurmcluster -t rosetta/slurmcluster    

    $BUILD_COMMAND services/slurmclustermaster -t rosetta/slurmclustermaster    

    $BUILD_COMMAND services/slurmclusterworker -t rosetta/slurmclusterworker    

    $BUILD_COMMAND services/dregistry -t rosetta/dregistry

    $BUILD_COMMAND services/webapp -t rosetta/webapp



    

else



    # Build a specific image

    $BUILD_COMMAND images/$SERVICE -t rosetta/$SERVICE

    $BUILD_COMMAND services/$SERVICE -t rosetta/$SERVICE



fi

rosetta/clean

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash



# Check if we are in the right place

if [ ! -d ./images ]; then

if [ ! -d ./services ]; then

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

    exit 1

fi