zombi/nginx-proxy
Archived
11
0
Fork 0
Code Issues Pull requests Releases Activity

Update to docker-gen 0.7.0

Browse source 
Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).

This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.

Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.

The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.

[1]: 50435652b1
This commit is contained in:
Pit Kleyersburg 2016-03-22 22:47:42 +01:00
parent f2966c5db1
commit 86aea653c8
9 changed files with 95 additions and 32 deletions

4
Makefile
View file

@ -2,8 +2,8 @@
.PHONY : test
update-dependencies:
docker pull jwilder/docker-gen:latest
docker pull nginx:latest
docker pull jwilder/docker-gen:0.7.0
docker pull nginx:1.9.12
docker pull python:3
docker pull rancher/socat-docker:latest
docker pull appropriate/curl:latest