From 6a96cfaac1fad23ae689ecc80ea2ed0a8af097e5 Mon Sep 17 00:00:00 2001 From: Daniel Wiesenberg Date: Tue, 6 Jul 2021 10:40:57 +0200 Subject: [PATCH] Change default port in docker to the new conduit default port 6167 and fix the docker healthcheck --- Dockerfile | 9 ++++++--- docker-compose.yml | 6 +++--- docker/docker-compose.traefik.yml | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51f146d..0eae25a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,8 +61,8 @@ LABEL org.opencontainers.image.created=${CREATED} \ org.label-schema.docker.build="docker build . -t matrixconduit/matrix-conduit:latest --build-arg CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') --build-arg VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml)" \ maintainer="Weasy666" -# Standard port on which Rocket launches -EXPOSE 8000 +# Standard port on which Conduit launches. You still need to map the port when using the docker command or docker-compose. +EXPOSE 6167 # Copy config files from context and the binary from # the "builder" stage to the current stage into folder @@ -90,7 +90,10 @@ RUN apk add --no-cache \ VOLUME ["/srv/conduit/.local/share/conduit"] # Test if Conduit is still alive, uses the same endpoint as Element -HEALTHCHECK --start-period=2s CMD curl --fail -s http://localhost:8000/_matrix/client/versions || curl -k --fail -s https://localhost:8000/_matrix/client/versions || exit 1 +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 # Set user to www-data USER www-data diff --git a/docker-compose.yml b/docker-compose.yml index cfc2462..cf0d2c1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,18 +18,18 @@ services: GIT_REF: origin/master restart: unless-stopped ports: - - 8448:8000 + - 8448:6167 volumes: - db:/srv/conduit/.local/share/conduit ### Uncomment if you want to use conduit.toml to configure Conduit ### Note: Set env vars will override conduit.toml values # - ./conduit.toml:/srv/conduit/conduit.toml environment: - CONDUIT_SERVER_NAME: localhost:8000 # replace with your own name + CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' ### Uncomment and change values as desired # CONDUIT_ADDRESS: 127.0.0.1 - # CONDUIT_PORT: 8000 + # CONDUIT_PORT: 6167 # CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if you want to configure purely by env vars, set this to an empty string '' # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging # CONDUIT_LOG: info # default is: "info,rocket=off,_=off,sled=off" diff --git a/docker/docker-compose.traefik.yml b/docker/docker-compose.traefik.yml index 943cf3c..3b36d10 100644 --- a/docker/docker-compose.traefik.yml +++ b/docker/docker-compose.traefik.yml @@ -25,11 +25,11 @@ services: networks: - proxy environment: - CONDUIT_SERVER_NAME: localhost:8000 # replace with your own name + CONDUIT_SERVER_NAME: localhost:6167 # replace with your own name CONDUIT_TRUSTED_SERVERS: '["matrix.org"]' ### Uncomment and change values as desired # CONDUIT_ADDRESS: 127.0.0.1 - # CONDUIT_PORT: 8000 + # CONDUIT_PORT: 6167 # CONDUIT_CONFIG: '/srv/conduit/conduit.toml' # if want to configure purely by env vars, set this to an empty string '' # Available levels are: error, warn, info, debug, trace - more info at: https://docs.rs/env_logger/*/env_logger/#enabling-logging # CONDUIT_LOG: info # default is: "info,rocket=off,_=off,sled=off"