resolves docker-library#282: add default healthcheck to dockerfiles

zaquestion · Nov 17, 2019 · a6b8662 · a6b8662
1 parent 5beb1d4
commit a6b8662
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 0 deletions.
diff --git a/10/Dockerfile b/10/Dockerfile
@@ -172,5 +172,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/10/alpine/Dockerfile b/10/alpine/Dockerfile
@@ -150,5 +150,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/11/Dockerfile b/11/Dockerfile
@@ -172,5 +172,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/11/alpine/Dockerfile b/11/alpine/Dockerfile
@@ -150,5 +150,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/12/Dockerfile b/12/Dockerfile
@@ -172,5 +172,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/12/alpine/Dockerfile b/12/alpine/Dockerfile
@@ -149,5 +149,7 @@ VOLUME /var/lib/postgresql/data
 COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.4/Dockerfile b/9.4/Dockerfile
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.4/alpine/Dockerfile b/9.4/alpine/Dockerfile
@@ -148,5 +148,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.5/Dockerfile b/9.5/Dockerfile
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.5/alpine/Dockerfile b/9.5/alpine/Dockerfile
@@ -148,5 +148,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.6/Dockerfile b/9.6/Dockerfile
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/9.6/alpine/Dockerfile b/9.6/alpine/Dockerfile
@@ -148,5 +148,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -150,5 +150,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -173,5 +173,7 @@ COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
+HEALTHCHECK --timeout=5s CMD pg_isready
+
 EXPOSE 5432
 CMD ["postgres"]