Update to Kong 0.9.9, replace dockerize with wait-for-it.

apim-haufe-io · Feb 8, 2017 · 0942590 · 0942590
1 parent ebfd21e
commit 0942590
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -1,6 +1,5 @@
-FROM kong:0.9.7
+FROM kong:0.9.9
 
-ENV DOCKERIZE_VERSION v0.2.0
 ENV KONG_PG_HOST kong-database
 ENV KONG_PG_USER kong
 ENV KONG_PG_PASSWORD kong
@@ -10,8 +9,8 @@ RUN yum install -y epel-release && yum install -y wget \\
     && yum clean all \\
     && wget -O /usr/local/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 \\
     && chmod +x /usr/local/bin/dumb-init \\
-    && wget -nv https://github.com/jwilder/dockerize/releases/download/\$DOCKERIZE_VERSION/dockerize-linux-amd64-\$DOCKERIZE_VERSION.tar.gz \\
-    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-\$DOCKERIZE_VERSION.tar.gz
+    && wget -O /usr/local/bin/wait-for-it.sh https://raw.githubusercontent.com/vishnubob/wait-for-it/55c54a5abdfb32637b563b28cc088314b162195e/wait-for-it.sh \\
+    && chmod +x /usr/local/bin/wait-for-it.sh
 
 COPY templates/nginx_kong.lua /root/nginx_kong.lua
 COPY startup.sh /startup.sh

diff --git a/startup.sh b/startup.sh
@@ -20,4 +20,4 @@ fi
 
 echo Using kong database host: $KONG_PG_HOST
 
-dockerize -wait tcp://kong-database:5432 kong start
+wait-for-it.sh -h $KONG_PG_HOST -p 5432 -t 30 -- kong start
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,4 @@ fi

		echo Using kong database host: $KONG_PG_HOST

		dockerize -wait tcp://kong-database:5432 kong start
		wait-for-it.sh -h $KONG_PG_HOST -p 5432 -t 30 -- kong start