Commit graph

5 commits

Author SHA1 Message Date
Marc Abramowitz
46684b7a66 Check for presence iof dockergen.conf
instead of hard-coded sleep of 2 seconds which is not super reliable
2016-03-02 10:05:48 -08:00
Marc Abramowitz
048bfad743 Pause 2 seconds before starting nginx
This hopefully lets nginx start after dockergen is done.

This prevents nginx from failing when there is a custom nginx config
that depends on things in the generated nginx config.

Fixes: GH-378
2016-03-02 09:52:33 -08:00
Sebastiaan van Stijn
3c5843264e Switch to official nginx base-image.
This changes the base-image to the official nginx image,
reducing the virtual size of the image by approx 50%.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2014-12-03 10:20:58 +01:00
Andrew Vos
61bb0a62fb Only add source after dependency download
This lets docker cache the ADD instruction, giving us a faster build.
Also, install docker-gen directly to /usr/local/bin.
2014-09-17 20:23:27 +01:00
Jason Wilder
4f3d690cd3 Stream logs to stdout/err
Nginx and docker-gen logs can now be seen via docker logs.
2014-06-03 16:30:05 -06:00