pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to postgres in a container

Browse Source
This commit is contained in:
Devon Mackay 2018-07-31 06:26:25 -04:00 committed by dandds
parent dd69506e72
commit 40359e8e2d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -3,9 +3,6 @@ language: python
python: "3.6" python: "3.6"
services: services:
- docker - docker
- postgres
addons:
postgresql: "9.6"
git: git:
submodules: false submodules: false
env: env:
@ -22,10 +19,11 @@ before_install:
- /sbin/ip addr - /sbin/ip addr
before_script: before_script:
- netstat -anlp | grep LISTEN | grep tcp - docker run -d --name postgres96 postgres:9.6-alpine
- travis_host_ip="$(/sbin/ip route|awk '/default/ { print $3 }')" - docker run --link postgres96:postgres96 waisbrot/wait
- postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)"
- docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL
- docker build --tag "${TESTER_IMAGE_NAME}" --add-host "travishost:${travis_host_ip}" . -f deploy/docker/tester/Dockerfile - docker build --tag "${TESTER_IMAGE_NAME}" --add-host "postgreshost:${postgres_ip}" . -f deploy/docker/tester/Dockerfile
script: script:
- docker run "${TESTER_IMAGE_NAME}" - docker run "${TESTER_IMAGE_NAME}"

2
config/ci.ini
View File

@ -1,2 +1,2 @@
[default] [default]
PGHOST = travishost PGHOST = postgreshost