diff options
author | Daniel Wiesenberg <weasy@hotmail.de> | 2021-08-30 09:14:08 +0200 |
---|---|---|
committer | Daniel Wiesenberg <weasy@hotmail.de> | 2021-08-30 09:14:08 +0200 |
commit | 9ded40e98329a02c1d504ae328c7ce4b8ca951da (patch) | |
tree | 86d25ac4c384dce112fc1697212358673ea94d90 /docker | |
parent | a469ca04610de779fe938629e139b0e3de8260a8 (diff) | |
download | conduit-9ded40e98329a02c1d504ae328c7ce4b8ca951da.zip |
Change healthcheck in ci dockerfile
Diffstat (limited to 'docker')
-rw-r--r-- | docker/ci-binaries-packaging.Dockerfile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docker/ci-binaries-packaging.Dockerfile b/docker/ci-binaries-packaging.Dockerfile index 797ef0c..1fe85bf 100644 --- a/docker/ci-binaries-packaging.Dockerfile +++ b/docker/ci-binaries-packaging.Dockerfile @@ -53,10 +53,7 @@ RUN apk add --no-cache \ libgcc # Test if Conduit is still alive, uses the same endpoint as Element -HEALTHCHECK --start-period=5s \ - CMD curl --fail -s "http://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \ - curl -k --fail -s "https://localhost:$(grep -m1 -o 'port\s=\s[0-9]*' conduit.toml | grep -m1 -o '[0-9]*')/_matrix/client/versions" || \ - exit 1 +HEALTHCHECK --start-period=5s --interval=60s CMD ./healthcheck.sh # Set user to www-data USER www-data @@ -68,3 +65,4 @@ ENTRYPOINT [ "/srv/conduit/conduit" ] # Copy the Conduit binary into the image at the latest possible moment to maximise caching: COPY ./conduit-x86_64-unknown-linux-musl /srv/conduit/conduit +COPY ./docker/healthcheck.sh /srv/conduit/ |