Reinstate ancient database settings for VREC

Reviewed-on: #11

abra.sh

@@ -1,4 +1,4 @@
-export APP_ENTRYPOINT_VERSION=v5
+export APP_ENTRYPOINT_VERSION=v6
 
 migrate() {
 	export DATABASE_PASSWORD=$(cat /run/secrets/db_password)

compose.google.yml

@@ -8,6 +8,7 @@ services:
     environment:
       - GOOGLE_CLIENT_ID
       - GOOGLE_ENABLED
+      - ALLOWED_DOMAINS
 
 secrets:
   google_client_secret:

compose.smtp.yml

@@ -1,14 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - SMTP_HOST
-      - SMTP_PORT
-      - SMTP_USERNAME
-      - SMTP_PASSWORD
-      - SMTP_FROM_EMAIL
-      - SMTP_REPLY_EMAIL
-      - SMTP_SECURE
-      - SMTP_TLS_CIPHERS

compose.yml

@@ -3,11 +3,10 @@ version: "3.8"
 
 services:
   app:
-    # entrypoint: ['tail', '-f', '/dev/null']
     networks:
       - backend
       - proxy
-    image: outlinewiki/outline:0.64.3
+    image: outlinewiki/outline:0.64.4
     secrets:
       - aws_secret_key
       - db_password
@@ -18,7 +17,6 @@ services:
         target: /docker-entrypoint.sh
         mode: 0555
     environment:
-      - DEBUG
       - AWS_ACCESS_KEY_ID
       - AWS_REGION
       - AWS_S3_ACL
@@ -29,6 +27,7 @@ services:
       - AWS_SDK_LOAD_CONFIG=0
       - AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key
       - DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - DATABASE_PASSWORD=pass
       - FORCE_HTTPS=true
       - PGSSLMODE=disable
       - REDIS_URL=redis://${STACK_NAME}_cache:6379
@@ -45,7 +44,7 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "coop-cloud.${STACK_NAME}.version=0.4.0+0.64.3"
+        - "coop-cloud.${STACK_NAME}.version=0.4.1+0.64.4"
         ## Redirect from EXTRA_DOMAINS to DOMAIN
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
@@ -56,7 +55,7 @@ services:
     networks:
       - backend
 
-  db:
+  postgres:
     image: postgres:11
     networks:
       - backend
@@ -64,8 +63,8 @@ services:
       - db_password
     environment:
       POSTGRES_DB: outline
-      POSTGRES_PASSWORD_FILE: /run/secrets/db_password
-      POSTGRES_USER: outline
+      POSTGRES_PASSWORD: pass
+      POSTGRES_USER: user
     volumes:
       - "postgres_data:/var/lib/postgresql/data"
 

entrypoint.sh.tmpl

@@ -12,7 +12,8 @@ export GOOGLE_CLIENT_SECRET=$(cat /run/secrets/google_client_secret)
 
 export UTILS_SECRET=$(cat /run/secrets/utils_secret)
 export SECRET_KEY=$(cat /run/secrets/secret_key)
-export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
-export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline"
+#export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
+export DATABASE_URL="postgres://user:${DATABASE_PASSWORD}@${STACK_NAME}_postgres:5432/outline"
 
+/usr/local/bin/yarn db:migrate --env=production-ssl-disabled
 /usr/local/bin/yarn start "$@"