From 1afef990279780c960fefad08fe040966558b809 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Fri, 2 Oct 2020 19:24:02 +0200
Subject: [PATCH] =?UTF-8?q?hardcoding=20=E2=86=92=20env=20file,=20tweak=20?=
 =?UTF-8?q?entrypoint?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml   | 12 ++----------
 docker-entrypoint.sh |  4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 624286e..20ac2de 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '2'
 
 services:
   app:
+    container_name: adapt
     image: 3wordchant/adaptauthoring:0.10.4
     build: .
     volumes:
@@ -14,16 +15,7 @@ services:
       - "5000:5000"
     networks:
       - internal
-    environment:
-      - PORT=5000
-      - DOMAIN=adapt.localhost
-      - DB_HOST=db
-      - DB_NAME=adapt
-      - DB_USER=adapt
-      - SESSION_SECRET=foobar
-      - ADMIN_EMAIL=foo@bar.com
-      - ADMIN_PASSWORD=foo
-      - FROM_EMAIL=adapt@localhost
+    env_file: .env
 
   db:
     container_name: adaptdb
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index d7328fe..106903f 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -28,7 +28,7 @@ load_vars() {
 }
 
 install_adapt() {
-	echo "No 'conf' dir found, installing Adapt"
+	echo "No 'conf' dir found, running 'node install...'"
 	# 3wc: use `yes` to skip the dbPass and dbAuthSource prompts
 	yes "" | node install --install Y \
    	--authoringToolRepository https://github.com/adaptlearning/adapt_authoring.git \
@@ -51,7 +51,7 @@ install_adapt() {
 }
 
 update_adapt() {
-	echo "Upgrade Adapt Authoring Tool & Framework"
+	echo "'conf' dir found, running 'node upgrade ...'"
 	node upgrade --continue Y --updateAutomatically Y
 }