Merge pull request #17 from samgh96/master

Add healthcheck command in CKAN
conwetlab · Mar 19, 2019 · e9ed426 · e9ed426
2 parents 90d6aa5 + 9037f74
commit e9ed426
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt install -y python-dev libpq-dev python-pip python-virtualenv git-core tzdata && \
+RUN apt-get update && apt install -y python-dev libpq-dev python-pip python-virtualenv git-core tzdata curl && \
     ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
     dpkg-reconfigure --frontend noninteractive tzdata && \
     \
@@ -35,6 +35,8 @@ COPY ./entrypoint.sh /
 
 EXPOSE 5000
 
+HEALTHCHECK CMD curl --fail http://localhost:5000/api/action/package_list || exit 1
+
 ENTRYPOINT ["/entrypoint.sh"]
 
 RUN . /usr/lib/ckan/default/bin/activate && \

diff --git a/docker/Dockerfile-2.7 b/docker/Dockerfile-2.7
@@ -4,7 +4,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 COPY libapache2-mod-wsgi_4.5.11-1_amd64.deb /libapache2-mod-wsgi_4.5.11-1_amd64.deb
 
-RUN apt-get update && apt install -y python-dev libpq-dev python-pip python-virtualenv git-core tzdata libpq5 && \
+RUN apt-get update && apt install -y python-dev libpq-dev python-pip python-virtualenv git-core tzdata libpq5 curl && \
     ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime && \
     dpkg-reconfigure --frontend noninteractive tzdata && \
     \
@@ -39,6 +39,8 @@ COPY ./entrypoint.sh /
 
 EXPOSE 5000
 
+HEALTHCHECK CMD curl --fail http://localhost:5000/api/action/package_list || exit 1
+
 ENTRYPOINT ["/entrypoint.sh"]
 
 RUN . /usr/lib/ckan/default/bin/activate && \