env file

Author: mluksch

docker-config/dev.yml

@@ -12,8 +12,8 @@ services:
         build: ./alignmentmysql
         volumes:
             - ../volumes/alignment/mysql:/var/lib/mysql
-        environment:
-            - MYSQL_ROOT_PASSWORD=$ALIGNMENT_MYSQL_PW
+        env_file:
+            - ../env.example
         ports:
             - "3306:3307"
     alignmentredis:
@@ -26,10 +26,8 @@ services:
         build: ./alignmentui
         volumes:
             - ../volumes/virtuosoStaging/data:/data
-        environment:
-            - MYSQL_ROOT_PASSWORD=$ALIGNMENT_MYSQL_PW
-            - GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
-            - GITHUB_CLIENT_SECRET=$GITHUB_CLIENT_SECRET
+        env_file:
+            - ../env.example
         links:
             - alignmentmysql
             - alignmentredis
@@ -65,6 +63,8 @@ services:
             - ./virtuoso/cronjobs/importFromTrig:/etc/cron.hourly/importFromTrig
             - ./virtuoso/cronjobs/importFromTTL:/etc/cron.hourly/importFromTTL
             - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        env_file:
+            - ../env.example
         environment:
             - DBA_PASSWORD=$VIRTUOSO_STAG_PW
             - SPARQL_UPDATE=true
@@ -80,17 +80,16 @@ services:
             - ../volumes/virtuosoStaging/data:/newdata
             - ./virtuoso/production/startVirtuoso.sh:/startVirtuoso.sh
             - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        env_file:
+            - ../env.example
         environment:
-            - DBA_PASSWORD=$VIRTUOSO_PROD_PW
             - SPARQL_UPDATE=false
             #- DEFAULT_GRAPH=te
         ports:
             - "8891:8890"
             - "1112:1111"
     virtuoso_staging_old:
-        image: openbudgets/virtuoso_staging_old
-        build: ./virtuoso
-        restart: always
+        image: openbudgets/virtuoso_staging:0.0.6
         volumes:
             - ../volumes/virtuosoStagingOld/data:/data
             - ../volumes/virtuosoStagingOld/upload:/upload
@@ -151,17 +150,17 @@ services:
         build: ./dampostgres
         volumes:
             - ../volumes/dam/dampostgres:/var/lib/postgresql/data
-        environment:
-            - POSTGRES_PASSWORD=$DAM_POSTGRES_PW
+        env_file:
+            - ../env.example
     damapp:
         image: openbudgets/damapp
         build: ./damapp
         ports:
             - "5000:5000"
         links:
             - dampostgres
-        environment:
-            - DAM_POSTGRES_PW=$DAM_POSTGRES_PW
+        env_file:
+            - ../env.example
     nginx:
         image: openbudgets/nginx
         build: ./nginx

docker-config/prod.yml

@@ -12,8 +12,8 @@ services:
         build: ./alignmentmysql
         volumes:
             - ../volumes/alignment/mysql:/var/lib/mysql
-        environment:
-            - MYSQL_ROOT_PASSWORD=$ALIGNMENT_MYSQL_PW
+        env_file:
+            - ../.env
         ports:
             - "3306:3307"
     alignmentredis:
@@ -26,10 +26,8 @@ services:
         build: ./alignmentui
         volumes:
             - ../volumes/virtuosoStaging/data:/data
-        environment:
-            - MYSQL_ROOT_PASSWORD=$ALIGNMENT_MYSQL_PW
-            - GITHUB_CLIENT_ID=$GITHUB_CLIENT_ID
-            - GITHUB_CLIENT_SECRET=$GITHUB_CLIENT_SECRET
+        env_file:
+            - ../.env
         links:
             - alignmentmysql
             - alignmentredis
@@ -158,10 +156,10 @@ services:
             - ./virtuoso/cronjobs/importFromTrig:/etc/cron.hourly/importFromTrig
             - ./virtuoso/cronjobs/importFromTTL:/etc/cron.hourly/importFromTTL
             - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        env_file:
+            - ../.env
         environment:
-            - DBA_PASSWORD=$VIRTUOSO_STAG_PW
             - SPARQL_UPDATE=true
-            #- DEFAULT_GRAPH=
         ports:
             - "8890:8890"
             - "1111:1111"
@@ -173,10 +171,10 @@ services:
             - ../volumes/virtuosoStaging/data:/newdata
             - ./virtuoso/production/startVirtuoso.sh:/startVirtuoso.sh
             - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        env_file:
+            - ../.env
         environment:
-            - DBA_PASSWORD=$VIRTUOSO_PROD_PW
             - SPARQL_UPDATE=false
-            #- DEFAULT_GRAPH=te
         ports:
             - "8891:8890"
             - "1112:1111"
@@ -187,10 +185,10 @@ services:
             - ../volumes/virtuosoStagingOld/upload:/upload
             - ../volumes/nginx/dumps:/dumps
             - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        env_file:
+            - ../.env
         environment:
-            - DBA_PASSWORD=$VIRTUOSO_STAG_PW
             - SPARQL_UPDATE=true
-            #- DEFAULT_GRAPH=te
         ports:
             - "8893:8890"
             - "1113:1111"
@@ -245,17 +243,17 @@ services:
         build: ./dampostgres
         volumes:
             - ../volumes/dam/dampostgres:/var/lib/postgresql/data
-        environment:
-            - POSTGRES_PASSWORD=$DAM_POSTGRES_PW
+        env_file:
+            - ../.env
     damapp:
         image: openbudgets/damapp
         build: ./damapp
         ports:
             - "5000:5000"
         links:
             - dampostgres
-        environment:
-            - DAM_POSTGRES_PW=$DAM_POSTGRES_PW
+        env_file:
+            - ../.env
     nginx:
         image: openbudgets/nginx
         build: ./nginx

env.example

@@ -0,0 +1,7 @@
+# Contains environment variables needed before starting Docker containers
+VIRTUOSO_STAG_PW=TEST
+VIRTUOSO_PROD_PW=TEST
+ALIGNMENT_MYSQL_PW=TEST
+GITHUB_CLIENT_ID=TEST
+GITHUB_CLIENT_SECRET=TEST
+DAM_POSTGRES_PW=TEST

infos/virtuoso_container.sh

@@ -6,4 +6,46 @@ docker run -v $PWD/../volumes/virtuosoStagingOld/data:/data \
 	-e "SPARQL_UPDATE=true" \
 	-p "8895:8890" \
 	-p "1115:1111" \
-	-ti openbudgets/virtuoso_staging:0.0.6 /bin/sh
+	-ti openbudgets/virtuoso_staging:0.0.6 /bin/sh
+
+docker run -v $PWD/../volumes/virtuoso_production/data:/data \
+	-v $PWD/../volumes/virtuosoStaging/data:/newdata \
+	-v $PWD/../volumes/nginx/dumps:/dumps \
+	-v $PWD/virtuoso/virtuoso.ini:/data/virtuoso.ini \
+	-e "DBA_PASSWORD=TEST" \
+	-e "SPARQL_UPDATE=false" \
+	-p "8895:8890" \
+	-p "1115:1111" \
+	-ti www /bin/sh
+
+
+
+    virtuoso_production:
+        image: openbudgets/virtuoso_production
+        build: ./virtuoso
+        volumes:
+            - ../volumes/virtuosoProduction/data:/data
+            - ../volumes/virtuosoStaging/data:/newdata
+            - ./virtuoso/production/startVirtuoso.sh:/startVirtuoso.sh
+            - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        environment:
+            - DBA_PASSWORD=$VIRTUOSO_PROD_PW
+            - SPARQL_UPDATE=false
+            #- DEFAULT_GRAPH=te
+        ports:
+            - "8891:8890"
+            - "1112:1111"
+    virtuoso_staging_old:
+        image: openbudgets/virtuoso_staging:0.0.6
+        volumes:
+            - ../volumes/virtuosoStagingOld/data:/data
+            - ../volumes/virtuosoStagingOld/upload:/upload
+            - ../volumes/nginx/dumps:/dumps
+            - ./virtuoso/virtuoso.ini:/data/virtuoso.ini
+        environment:
+            - DBA_PASSWORD=$VIRTUOSO_STAG_PW
+            - SPARQL_UPDATE=true
+            #- DEFAULT_GRAPH=te
+        ports:
+            - "8893:8890"
+            - "1113:1111"

maintenance_utils/virtuoso/import/importDumpToVirtuoso.sh

@@ -10,6 +10,6 @@ echo "Created graph-files for each ttl-file"
 
 # Upload to Virtuoso:
 echo "Upload to Virtuoso..."
-. ../../../setEnv
+. ../../../env
 docker exec dockerconfig_virtuoso_staging_1 /bin/sh /importDump.sh $VIRTUOSO_STAG_PW
 echo "Uploaded to Virtuoso."

refresh_and_restart_dev.sh

@@ -4,8 +4,7 @@ git pull origin master
 export COMPOSE_HTTP_TIMEOUT=200
 export GOMAXPROCS=4
 OBEU_WORKDIR=$PWD
-cd $OBEU_WORKDIR && . ./setEnv
-
+s
 # -- build: Only rebuilding Images that have changed
     # -- build: Only rebuilding Images that have changed
 cd $OBEU_WORKDIR/docker-config && \

refresh_and_restart_dev_tagged.sh

@@ -4,7 +4,6 @@ git pull origin master
 export COMPOSE_HTTP_TIMEOUT=200
 export GOMAXPROCS=4
 OBEU_WORKDIR=$PWD
-cd $OBEU_WORKDIR && . ./setEnv
 
 # -- build: Only rebuilding Images that have changed
     # -- build: Only rebuilding Images that have changed

refresh_and_restart_prod.sh

@@ -4,7 +4,6 @@ git pull origin master
 export COMPOSE_HTTP_TIMEOUT=200
 export GOMAXPROCS=4
 OBEU_WORKDIR=$PWD
-cd $OBEU_WORKDIR && . ./setEnv
 
 # -- build: Only rebuilding Images that have changed
     # -- build: Only rebuilding Images that have changed

refresh_and_restart_prod_tagged.sh

@@ -4,7 +4,6 @@ git pull origin master
 export COMPOSE_HTTP_TIMEOUT=200
 export GOMAXPROCS=4
 OBEU_WORKDIR=$PWD
-cd $OBEU_WORKDIR && . ./setEnv
 
 # -- build: Only rebuilding Images that have changed
     # -- build: Only rebuilding Images that have changed

setEnv.example

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 OBEU_WORKDIR=$PWD
-cd $OBEU_WORKDIR && . ./setEnv
+cd $OBEU_WORKDIR && . env
 cd $OBEU_WORKDIR/docker-config && \
     docker-compose -f dev.yml stop