Skip to content

Commit 2ac4e54

Browse files
authored
Merge pull request #363 from CachetHQ/lrstanley/patch-1
Set production by default
2 parents 42b3caa + 600f51d commit 2ac4e54

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ services:
2828
- DB_PREFIX=chq_
2929
- APP_KEY=${APP_KEY:-null}
3030
- APP_LOG=errorlog
31+
- APP_ENV=${APP_ENV:-production}
32+
- APP_DEBUG=false
3133
- DEBUG=false
3234
depends_on:
3335
- postgres

test/test.full.bats

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ load docker_helpers
44
load "lib/batslib"
55
load "lib/output"
66

7-
export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
8-
97
@test "[$TEST_FILE] testing Cachet Docker image build" {
108
command docker-compose build --no-cache cachet
119
}

test/test.mysql.bats

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ load docker_helpers
44
load "lib/batslib"
55
load "lib/output"
66

7-
export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
8-
97
@test "[$TEST_FILE] docker-compose up" {
108
command docker-compose -f test/docker-compose-mysql.yml up -d
119
}

test/test.sqlite.bats

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ load docker_helpers
44
load "lib/batslib"
55
load "lib/output"
66

7-
export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
8-
97
@test "[$TEST_FILE] docker-compose up" {
108
command docker-compose -f test/docker-compose-sqlite.yml up -d
119
}

test/test_helpers.bash

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
type docker &>/dev/null || ( echo "docker is not available"; exit 1 )
44
)>&2
55

6+
# ENV vars for tests
7+
export APP_ENV=development
8+
export APP_KEY="base64:v2LwHrdgnE+RavEXdnF8LgWIibjvEcFkU2qaX5Ji708="
9+
610
TEST_FILE=$(basename $BATS_TEST_FILENAME .bats)
711

812
# stop all containers with the "bats-type" label (matching the optionally supplied value)

0 commit comments

Comments
 (0)