Default to production, allow override for tests

djdefi · djdefi · commit 600f51d6b5eb · 2020-01-29T21:43:21.000-08:00
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - DB_PREFIX=chq_
       - APP_KEY=${APP_KEY:-null}
       - APP_LOG=errorlog
-      - APP_ENV=production
+      - APP_ENV=${APP_ENV:-production}
       - APP_DEBUG=false
       - DEBUG=false
     depends_on:
diff --git a/test/test.full.bats b/test/test.full.bats
@@ -4,8 +4,6 @@ load docker_helpers
 load "lib/batslib"
 load "lib/output"
 
-export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
-
 @test "[$TEST_FILE] testing Cachet Docker image build" {
   command docker-compose build --no-cache cachet
 }
diff --git a/test/test.mysql.bats b/test/test.mysql.bats
@@ -4,8 +4,6 @@ load docker_helpers
 load "lib/batslib"
 load "lib/output"
 
-export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
-
 @test "[$TEST_FILE] docker-compose up" {
   command docker-compose -f test/docker-compose-mysql.yml up -d
 }
diff --git a/test/test.sqlite.bats b/test/test.sqlite.bats
@@ -4,8 +4,6 @@ load docker_helpers
 load "lib/batslib"
 load "lib/output"
 
-export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
-
 @test "[$TEST_FILE] docker-compose up" {
   command docker-compose -f test/docker-compose-sqlite.yml up -d
 }
diff --git a/test/test_helpers.bash b/test/test_helpers.bash
@@ -3,6 +3,10 @@
 	type docker &>/dev/null || ( echo "docker is not available"; exit 1 )
 )>&2
 
+# ENV vars for tests
+export APP_ENV=development
+export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
+
 TEST_FILE=$(basename $BATS_TEST_FILENAME .bats)
 
 # stop all containers with the "bats-type" label (matching the optionally supplied value)

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ load docker_helpers`
`4`	`4`	`load "lib/batslib"`
`5`	`5`	`load "lib/output"`
`6`	`6`
`7`		`-export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="`
`8`		`-`
`9`	`7`	`@test "[$TEST_FILE] testing Cachet Docker image build" {`
`10`	`8`	`command docker-compose build --no-cache cachet`
`11`	`9`	`}`