char/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Change healthcheck in ci dockerfile

Browse source
This commit is contained in:
Daniel Wiesenberg 2021-08-30 09:14:08 +02:00
parent a469ca0461
commit 9ded40e983
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/ci-binaries-packaging.Dockerfile
View file

@ -53,10 +53,7 @@ RUN apk add --no-cache \
libgcc libgcc
# Test if Conduit is still alive, uses the same endpoint as Element # Test if Conduit is still alive, uses the same endpoint as Element
HEALTHCHECK --start-period=5s \ HEALTHCHECK --start-period=5s --interval=60s CMD ./healthcheck.sh
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
# Set user to www-data # Set user to www-data
USER 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 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 ./conduit-x86_64-unknown-linux-musl /srv/conduit/conduit
COPY ./docker/healthcheck.sh /srv/conduit/