env variables

Author: normanrz

app/utils/WkConf.scala

@@ -19,7 +19,9 @@ class WkConf @Inject()(configuration: Configuration, certificateValidationServic
     // Applying feature overwrites to the configuration.
     Configuration(
       ConfigFactory
-        .parseMap(featureOverrides.map { case (k, v) => s"features.$k" -> v }.asJava)
+        .parseMap(featureOverrides.map {
+          case (k, v) => s"features.$k" -> Boolean.box(v && configuration.underlying.getBoolean(s"features.$k"))
+        }.asJava)
         .withFallback(configuration.underlying))
   }
 

docker-compose.yml

@@ -40,9 +40,10 @@ services:
     volumes:
       - ./binaryData:/webknossos/binaryData
     environment:
-      POSTGRES_URL: jdbc:postgresql://postgres/webknossos
-      POSTGRES_USER: webknossos_user
-      POSTGRES_PASSWORD: secret_password
+      - CERTIFICATE
+      - POSTGRES_URL=jdbc:postgresql://postgres/webknossos
+      - POSTGRES_USER=webknossos_user
+      - POSTGRES_PASSWORD=secret_password
     user: ${USER_UID:-1000}:${USER_GID:-1000}
 
   webknossos-datastore:
@@ -100,6 +101,8 @@ services:
       - USER_UID
       - USER_GID
       - COVERALLS_REPO_TOKEN
+      - CERTIFICATE
+      - CERTIFICATE_PUBLIC_KEY
       - TZ=${TZ:-Europe/Berlin}
       - POSTGRES_URL=jdbc:postgresql://postgres/webknossos
       - POSTGRES_USER=webknossos_user
@@ -142,9 +145,9 @@ services:
       fossildb-dev:
         condition: service_healthy
     environment:
-      POSTGRES_URL: jdbc:postgresql://postgres/webknossos
-      POSTGRES_USER: webknossos_user
-      POSTGRES_PASSWORD: secret_password
+      - POSTGRES_URL=jdbc:postgresql://postgres/webknossos
+      - POSTGRES_USER=webknossos_user
+      - POSTGRES_PASSWORD=secret_password
     command:
       - bash
       - -c
@@ -186,9 +189,10 @@ services:
       fossildb:
         condition: service_healthy
     environment:
-      POSTGRES_URL: jdbc:postgresql://postgres/webknossos_testing
-      POSTGRES_USER: webknossos_user
-      POSTGRES_PASSWORD: secret_password
+      - CERTIFICATE
+      - POSTGRES_URL=jdbc:postgresql://postgres/webknossos
+      - POSTGRES_USER=webknossos_user
+      - POSTGRES_PASSWORD=secret_password
     command:
       - bash
       - -c
@@ -218,9 +222,9 @@ services:
   postgres:
     image: postgres:10-alpine
     environment:
-      POSTGRES_DB: webknossos
-      POSTGRES_USER: webknossos_user
-      POSTGRES_PASSWORD: secret_password
+      - POSTGRES_DB=webknossos
+      - POSTGRES_USER=webknossos_user
+      - POSTGRES_PASSWORD=secret_password
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -d webknossos -U webknossos_user -h 127.0.0.1 -p 5432"]
       interval: 2s
@@ -252,7 +256,7 @@ services:
       postgres-persisted:
         condition: service_healthy
     environment:
-      PGPASSWORD: secret_password
+      - PGPASSWORD=secret_password
     volumes:
       - ./conf/evolutions/:/evolutions/
 
@@ -265,7 +269,7 @@ services:
       postgres-dev:
         condition: service_healthy
     environment:
-      PGPASSWORD: secret_password
+      - PGPASSWORD=secret_password
 
   # FossilDB
   fossildb: