Skip to content
This repository was archived by the owner on Oct 23, 2018. It is now read-only.

Commit d4167fd

Browse files
authoredOct 21, 2018
Remove secrets from version control (#46)
* Delete .env * Add .env to .gitignore * Update CI config to use env variables * Remove .env from base docker-compose config Env variables should be set in the extending files. * Generate .env file for CI
1 parent 132511d commit d4167fd

6 files changed

+6
-7
lines changed
 

‎.env

-2
This file was deleted.

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ database/uploads
2424
*/npm-debug.log*
2525
*/yarn-debug.log*
2626
*/yarn-error.log*
27+
28+
.env

‎.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ install:
1010
- yarn --cwd ./server
1111

1212
before_script:
13+
- echo "GAMEKEY=$GAMEKEY" >> ./server/.env
14+
- echo "FILMKEY=$FILMKEY" >> ./server/.env
1315
- yarn --cwd ./web lint || yarn --cwd ./server lint
1416

1517
script:

‎docker-compose.prod.yml

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ services:
88
target: prod
99
environment:
1010
NODE_ENV: 'production'
11-
env_file:
12-
- .env
1311
postgres:
1412
image: cs4920-postgres:prod
1513
build:

‎docker-compose.test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
- node_modules:/usr/src/app/server/node_modules
1111
environment:
1212
DB_HOST: postgres:5432
13-
env_file: .env
13+
env_file: ./server/.env
1414
postgres:
1515
image: cs4920-postgres:prod
1616
build:

‎docker-compose.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
- '8080:8080'
1414
environment:
1515
DB_HOST: postgres:5432
16-
env_file: .env
16+
env_file: ./server/.env
1717
postgres:
1818
build:
1919
context: ./database
@@ -26,4 +26,3 @@ services:
2626
volumes:
2727
? db-data
2828
? node_modules
29-

0 commit comments

Comments
 (0)
This repository has been archived.