From 47dd42e486705a6f13db113c70fb358fcd17d7d2 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Sun, 29 May 2022 20:14:46 +0200
Subject: [PATCH] Removed any conf files, now using only env vars.
---
README.md | 10 ++++++++--
docker-compose-dev.yml | 8 +++++++-
rosetta/setup | 18 ------------------
services/webapp/Dockerfile | 3 ---
services/webapp/db_conf-dev.sh | 13 -------------
services/webapp/run_webapp.sh | 3 ---
6 files changed, 15 insertions(+), 40 deletions(-)
delete mode 100755 rosetta/setup
delete mode 100644 services/webapp/db_conf-dev.sh
diff --git a/README.md b/README.md
index d290db3..92ba938 100755
--- a/README.md
+++ b/README.md
@@ -17,9 +17,9 @@ Requirements:
*Windows not fully supported in development mode due to lack of support for symbolic links.
-Setup
+Inizialize
- $ rosetta/setup
+ $ cp docker-compose-dev.yml docker-compose.yml
Build
@@ -46,6 +46,12 @@ Clean
Webapp service configuraion parameters and their defaults:
- SAFEMODE=false
+ - DJANGO_DB_ENGINE="django.db.backends.postgresql_psycopg2"
+ - DJANGO_DB_NAME="rosetta"
+ - DJANGO_DB_USER="rosetta_master"
+ - DJANGO_DB_PASSWORD="949fa84a"
+ - DJANGO_DB_HOST="postgres"
+ - DJANGO_DB_PORT=5432
- DJANGO_DEV_SERVER=true
- DJANGO_DEBUG=true
- DJANGO_LOG_LEVEL=ERROR
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 32de0b2..7378dca 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -10,7 +10,6 @@ services:
privileged: true
volumes:
- ./data/shared:/shared
- # - ./data/singularity_cache:/rosetta/.singularity/cache # Not working, check permissions...
slurmclusterworker:
image: "rosetta/slurmclusterworker"
@@ -54,6 +53,12 @@ services:
hostname: webapp
environment:
- SAFEMODE=False
+ - DJANGO_DB_ENGINE="django.db.backends.postgresql_psycopg2"
+ - DJANGO_DB_NAME="rosetta"
+ - DJANGO_DB_USER="rosetta_master"
+ - DJANGO_DB_PASSWORD="949fa84a"
+ - DJANGO_DB_HOST="postgres"
+ - DJANGO_DB_PORT=5432
- DJANGO_DEV_SERVER=True
- DJANGO_DEBUG=True
- DJANGO_LOG_LEVEL=CRITICAL
@@ -68,6 +73,7 @@ services:
#- ROSETTA_TASKS_PROXY_HOST=
#- ROSETTA_TASKS_TUNNEL_HOST=
- ROSETTA_HOST=localhost
+
ports:
- "8080:8080"
- "7000-7020:7000-7020"
diff --git a/rosetta/setup b/rosetta/setup
deleted file mode 100755
index 2a9103d..0000000
--- a/rosetta/setup
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# 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
-else
- echo "Not using dev webapp database settings as settings 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
diff --git a/services/webapp/Dockerfile b/services/webapp/Dockerfile
index 940e4b9..a37b9ec 100644
--- a/services/webapp/Dockerfile
+++ b/services/webapp/Dockerfile
@@ -60,9 +60,6 @@ COPY code /opt/code
# Fix permissions
RUN chown -R rosetta:rosetta /opt/code
-# Copy db conf
-COPY db_conf.sh /db_conf.sh
-
# Prepare for logs
RUN mkdir /var/log/webapp/ && chown rosetta:rosetta /var/log/webapp/
diff --git a/services/webapp/db_conf-dev.sh b/services/webapp/db_conf-dev.sh
deleted file mode 100644
index 412d890..0000000
--- a/services/webapp/db_conf-dev.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# SQlite Django DB conf
-#export DJANGO_DB_ENGINE="django.db.backends.sqlite3"
-#export DJANGO_DB_NAME="/data/resources/database.sqlite3"
-
-# Postgres Django DB conf
-export DJANGO_DB_ENGINE="django.db.backends.postgresql_psycopg2"
-export DJANGO_DB_NAME="rosetta"
-export DJANGO_DB_USER="rosetta_master"
-export DJANGO_DB_PASSWORD="949fa84a"
-export DJANGO_DB_HOST="postgres"
-export DJANGO_DB_PORT=5432
diff --git a/services/webapp/run_webapp.sh b/services/webapp/run_webapp.sh
index 10f55b5..e1b7114 100644
--- a/services/webapp/run_webapp.sh
+++ b/services/webapp/run_webapp.sh
@@ -14,9 +14,6 @@ echo ""
# Load env
source /env.sh
-# Database conf
-source /db_conf.sh
-
# Stay quiet on Python warnings
export PYTHONWARNINGS=ignore
--
GitLab