From 06d9fd2d2556dba2da18f04efa113ce711a51115 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Fri, 28 Aug 2020 13:56:59 +0200
Subject: [PATCH] Moved from "data_rosetta" to "data".
---
docker-compose-dev.yml | 14 +++++++-------
rosetta/logs | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 6461a7b..d31aa94 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -9,7 +9,7 @@ services:
- SAFEMODE=False
privileged: true
volumes:
- - ./data_rosetta/shared:/shared
+ - ./data/shared:/shared
# - ./data/singularity_cache:/rosetta/.singularity/cache # Not working, check permissions...
slurmclusterworker-one:
@@ -20,14 +20,14 @@ services:
- SAFEMODE=False
privileged: true
volumes:
- - ./data_rosetta/shared:/shared
+ - ./data/shared:/shared
dregistry:
container_name: dregistry
hostname: dregistry
image: "rosetta/dregistry"
volumes:
- - ./data_rosetta/dregistry:/var/lib/registry
+ - ./data/dregistry:/var/lib/registry
ports:
- "5000:5000"
@@ -38,7 +38,7 @@ services:
environment:
- SAFEMODE=False
volumes:
- - ./data_rosetta/postgres/data:/data
+ - ./data/postgres/data:/data
webapp:
image: "rosetta/webapp"
@@ -62,8 +62,8 @@ services:
- "8080:8080"
- "7000-7020:7000-7020"
volumes:
- - ./data_rosetta/webapp/data:/data
- - ./data_rosetta/webapp/log:/var/log/webapp
+ - ./data/webapp/data:/data
+ - ./data/webapp/log:/var/log/webapp
- /var/run/docker.sock:/var/run/docker.sock
- ./services/webapp/code:/opt/code
@@ -77,7 +77,7 @@ services:
- "80:80"
- "443:443"
volumes:
- - ./data_rosetta/proxy/data:/data
+ - ./data/proxy/data:/data
diff --git a/rosetta/logs b/rosetta/logs
index 41a9ad1..c1f7123 100755
--- a/rosetta/logs
+++ b/rosetta/logs
@@ -12,7 +12,7 @@ if [[ $# -eq 0 ]] ; then
fi
if [[ "x$2" != "x" ]] ; then
- tail -f -n 1000 data_rosetta/$1/log/$2.log
+ tail -f -n 1000 data/$1/log/$2.log
else
docker-compose logs -f $1
fi
--
GitLab