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

Added docker-compose.yml to gitignore, added a docker-compose-dev.yml and... 

Added docker-compose.yml to gitignore, added a docker-compose-dev.yml and included it in the setup pahse.
parent fab161d8

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -17,3 +17,6 @@ data* 
# DB conf

services/webapp/db_conf.sh

services/proxy/certificates



# Compose

docker-compose.yml

docker-compose.yml→docker-compose-dev.yml

+1 −9
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ services: 
    volumes:

      - ./data_rosetta/shared:/shared

      # - ./data/singularity_cache:/rosetta/.singularity/cache # Not working, check permissions...

    ports:

      - "8590:8590"

      - "5900:5900"



  slurmclusterworker-one:

    image: "rosetta/slurmclusterworker"
@@ -24,9 +21,6 @@ services: 
    privileged: true

    volumes:

      - ./data_rosetta/shared:/shared

    ports:

      - "8591:8590"

      - "5901:5900"



  dregistry:

    container_name: dregistry
@@ -64,14 +58,12 @@ services: 
      #- DJANGO_PUBLIC_HTTP_HOST=http://localhost:8080

    ports:

      - "8080:8080"

      - "8000:8590"

      - "8592:8592"

      - "7000-7005:7000-7005"

    volumes:

      - ./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/webapp_code



  proxy:

    image: "rosetta/proxy"

rosetta/setup

+11 −2
Original line number Diff line number Diff line 
#!/bin/bash



# Use dev (local) database for backend

# Use dev (local) database for backend if not alredy set up

if [ ! -f services/webapp/db_conf.sh ]; then

    echo "Using dev webapp database settings."

    cp services/webapp/db_conf-dev.sh  services/webapp/db_conf.sh
@@ -9,10 +9,19 @@ else 
fi





# Use dev (local) database for backend

# Use dev certificates if not already set up

if [ ! -d services/proxy/certificates ]; then

    echo "Using dev certificates."

    cp -a services/proxy/certificates-dev  services/proxy/certificates

else

    echo "Not using dev certificates as certificates are already present."

fi





# Use dev docker-compose.yml if not already set up

if [ ! -f docker-compose.yml ]; then

    echo "Using dev docker-compose.yml"

    cp docker-compose-dev.yml docker-compose.yml

else

    echo "Not using dev docker-compose.yml as already present."

fi