Skip to content

Commit

Permalink
Update docker images (#225)
Browse files Browse the repository at this point in the history
* Ensure docker-compose is up-to-date

* Ensure images are up-to-date

* Add postgres exploration container

* Remove bad assertion

* Build images in parallel
  • Loading branch information
c-w authored Aug 25, 2019
1 parent e68e333 commit 5e18884
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 11 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ AZURITE_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZF
AZURITE_HOST=azurite:10000
AZURITE_SECURE=False

PGWEB_PORT=8882
POSTGRES_PORT=8881
POSTGRES_USER=ascoderu
POSTGRES_PASSWORD=secretpassword
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ env:
services:
- docker

before_install:
- |
sudo curl -fsSL "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
docker-compose version
script:
- |
if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]; then
Expand Down
12 changes: 10 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ services:
command: /app/setup.sh --help

rabbitmq:
image: rabbitmq:3.7.8-management
image: rabbitmq:management-alpine

appinsights:
image: cwolff/appinsights-on-premises:0.0.14-postgres
image: cwolff/appinsights-on-premises:0.1.2-postgres
depends_on:
- postgres
environment:
Expand All @@ -125,3 +125,11 @@ services:
executable: blob
ports:
- ${AZURITE_PORT}:10000

pgweb:
image: sosedoff/pgweb:latest
depends_on:
- postgres
command: ["/usr/bin/pgweb", "--bind=0.0.0.0", "--listen=8000", "--url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=disable"]
ports:
- ${PGWEB_PORT}:8000
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ clean:

build:
docker-compose pull --ignore-pull-failures
docker-compose build
docker-compose build --parallel

start:
docker-compose up -d
Expand Down
8 changes: 0 additions & 8 deletions tests/integration/assert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,3 @@ if [[ "${num_exceptions}" -ne "${num_exceptions_expected}" ]]; then
echo "Got ${num_exceptions} exceptions but expected ${num_exceptions_expected}" >&2
exit 2
fi

num_error_requests="$(sql_query 'select count(*) from requests where status_code != 200;')"
num_error_requests_expected=1

if [[ "${num_error_requests}" -ne "${num_error_requests_expected}" ]]; then
echo "Got ${num_error_requests} error requests but expected ${num_error_requests_expected}" >&2
exit 3
fi

0 comments on commit 5e18884

Please sign in to comment.