From fa1b12366ad7dc2c2be23a11c55123d077b3f6b4 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Fri, 15 May 2020 01:02:00 +0200
Subject: [PATCH] Added docker-compose.yml to gitignore, added a
docker-compose-dev.yml and included it in the setup pahse.
---
.gitignore | 3 +++
docker-compose.yml => docker-compose-dev.yml | 10 +---------
rosetta/setup | 13 +++++++++++--
3 files changed, 15 insertions(+), 11 deletions(-)
rename docker-compose.yml => docker-compose-dev.yml (91%)
diff --git a/.gitignore b/.gitignore
index 6a928e0..e8f01ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ data*
# DB conf
services/webapp/db_conf.sh
services/proxy/certificates
+
+# Compose
+docker-compose.yml
diff --git a/docker-compose.yml b/docker-compose-dev.yml
similarity index 91%
rename from docker-compose.yml
rename to docker-compose-dev.yml
index 35448f2..0bcbb47 100644
--- a/docker-compose.yml
+++ b/docker-compose-dev.yml
@@ -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"
diff --git a/rosetta/setup b/rosetta/setup
index a22abaf..70b6081 100755
--- a/rosetta/setup
+++ b/rosetta/setup
@@ -1,6 +1,6 @@
#!/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
--
GitLab