Skip to content

Set production by default #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 30, 2020
Merged

Set production by default #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1e5e62
set better security defaults in docker-compose.yml
lrstanley May 7, 2019
f7ed24b
Merge branch 'master' into patch-1
djdefi Jan 30, 2020
600f51d
Default to production, allow override for tests
djdefi Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ services:
- DB_PREFIX=chq_
- APP_KEY=${APP_KEY:-null}
- APP_LOG=errorlog
- APP_ENV=${APP_ENV:-production}
- APP_DEBUG=false
- DEBUG=false
depends_on:
- postgres
Expand Down
2 changes: 0 additions & 2 deletions test/test.full.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions test/test.mysql.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 0 additions & 2 deletions test/test.sqlite.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 4 additions & 0 deletions test/test_helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down