jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

move passwords to env

Browse Source
This commit is contained in:
Albert Yi
2018-05-09 15:15:25 -07:00
parent d4a2521eec
commit 780d899c85
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@@ -4,7 +4,9 @@ language: bash
env: env:
global: global:
- DOCKER_COMPOSE_VERSION=1.21.1 - DOCKER_COMPOSE_VERSION=1.21.1
- PGHOST
- PGPORT
before_install: before_install:
- sudo rm /usr/local/bin/docker-compose - sudo rm /usr/local/bin/docker-compose
@@ -13,10 +15,10 @@ before_install:
- sudo mv docker-compose /usr/local/bin - sudo mv docker-compose /usr/local/bin
install: install:
- env | egrep 'DANBOORU|RAILS|DATABASE_URL|SECRET' > .env.test - env | egrep 'DEBUG|DANBOORU|RAILS|DATABASE_URL|SECRET' > .env.test
- docker-compose -f config/docker/compose.yml up -d web - docker-compose -f config/docker/compose.yml up -d web
- docker-compose -f config/docker/compose.yml exec archives dockerize -wait tcp://db:5432 bash -l -c 'cd /app ; bundle exec rake db:create ; bundle exec rake db:migrate' - docker-compose -f config/docker/compose.yml exec archives dockerize -wait tcp://$PGHOST:$PGPORT bash -l -c 'cd /app ; bundle exec rake db:create ; bundle exec rake db:migrate'
- docker-compose -f config/docker/compose.yml exec web dockerize -wait tcp://db:5432 bash -l -c 'cd /app ; bin/rake db:create ; bin/rake db:migrate' - docker-compose -f config/docker/compose.yml exec web dockerize -wait tcp://$PGHOST:$PGPORT bash -l -c 'cd /app ; bin/rake db:create ; bin/rake db:migrate'
script: script:
- docker-compose -f config/docker/compose.yml exec web bin/rake test - docker-compose -f config/docker/compose.yml exec web bin/rake test

13
config/docker/compose.yml
View File

@@ -5,7 +5,7 @@ services:
ports: ports:
- "5432:5432" - "5432:5432"
environment: environment:
- POSTGRES_PASSWORD=73e1ac2e91eb52a9981d09fca561aac3 - POSTGRES_PASSWORD
memcached: memcached:
image: memcached:alpine image: memcached:alpine
ports: ports:
@@ -15,9 +15,9 @@ services:
image: r888888888/archives image: r888888888/archives
command: sleep 1d command: sleep 1d
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST
- POSTGRES_USER=postgres - POSTGRES_USER
- POSTGRES_PASSWORD=73e1ac2e91eb52a9981d09fca561aac3 - POSTGRES_PASSWORD
- RAILS_ENV - RAILS_ENV
- AMAZON_KEY - AMAZON_KEY
- AMAZON_SQS_REGION - AMAZON_SQS_REGION
@@ -28,11 +28,12 @@ services:
- db - db
web: web:
environment: environment:
- SECRET_TOKEN=73e1ac2e91eb52a9981d09fca561aac3 - SECRET_TOKEN
- SESSION_SECRET_KEY=73e1ac2e91eb52a9981d09fca561aac3 - SESSION_SECRET_KEY
- RAILS_ENV - RAILS_ENV
- DATABASE_URL - DATABASE_URL
- RO_DATABASE_URL - RO_DATABASE_URL
- DEBUG
- ARCHIVE_DATABASE_URL - ARCHIVE_DATABASE_URL
- DANBOORU_MEMCACHED_SERVERS - DANBOORU_MEMCACHED_SERVERS
- DANBOORU_AWS_SQS_ARCHIVE_URL - DANBOORU_AWS_SQS_ARCHIVE_URL