From 980bb96c741cb3c8c1aebe26fbfb45a457fb58be Mon Sep 17 00:00:00 2001 From: Stephan D Date: Fri, 5 Dec 2025 05:43:08 +0100 Subject: [PATCH 1/2] relaxed healthcheck --- ci/prod/compose/frontend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/prod/compose/frontend.yml b/ci/prod/compose/frontend.yml index 9a1ef16..ef0c0d7 100644 --- a/ci/prod/compose/frontend.yml +++ b/ci/prod/compose/frontend.yml @@ -31,7 +31,7 @@ services: - "0.0.0.0:${FRONTEND_HTTP_PORT}:80" - "0.0.0.0:${FRONTEND_HTTPS_PORT}:443" healthcheck: - test: ["CMD-SHELL","curl -sf http://localhost:80/ >/dev/null"] + test: ["CMD", "curl", "-f", "http://localhost:2019/config"] interval: 30s timeout: 10s retries: 3 From 98f254e34be4402dff53530c712002416ec89ae8 Mon Sep 17 00:00:00 2001 From: Stephan D Date: Fri, 5 Dec 2025 05:50:34 +0100 Subject: [PATCH 2/2] docker conflict resolved --- api/gateway/mntx/internal/server/internal/serverimp.go | 2 +- ci/prod/compose/mntx_gateway.dockerfile | 2 +- ci/prod/compose/mntx_gateway.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/gateway/mntx/internal/server/internal/serverimp.go b/api/gateway/mntx/internal/server/internal/serverimp.go index 963a08d..b85a478 100644 --- a/api/gateway/mntx/internal/server/internal/serverimp.go +++ b/api/gateway/mntx/internal/server/internal/serverimp.go @@ -163,7 +163,7 @@ func (i *Imp) loadConfig() (*config, error) { } if cfg.Metrics == nil { - cfg.Metrics = &grpcapp.MetricsConfig{Address: ":9404"} + cfg.Metrics = &grpcapp.MetricsConfig{Address: ":9405"} } return cfg, nil diff --git a/ci/prod/compose/mntx_gateway.dockerfile b/ci/prod/compose/mntx_gateway.dockerfile index f9132bb..f5a3024 100644 --- a/ci/prod/compose/mntx_gateway.dockerfile +++ b/ci/prod/compose/mntx_gateway.dockerfile @@ -37,6 +37,6 @@ COPY api/gateway/mntx/config.yml /app/config.yml COPY api/gateway/mntx/entrypoint.sh /app/entrypoint.sh COPY --from=build /out/mntx-gateway /app/mntx-gateway RUN chmod +x /app/entrypoint.sh -EXPOSE 50075 9404 8084 +EXPOSE 50075 9405 8084 ENTRYPOINT ["/app/entrypoint.sh"] CMD ["/app/mntx-gateway","--config.file","/app/config.yml"] diff --git a/ci/prod/compose/mntx_gateway.yml b/ci/prod/compose/mntx_gateway.yml index a60c919..6237ad6 100644 --- a/ci/prod/compose/mntx_gateway.yml +++ b/ci/prod/compose/mntx_gateway.yml @@ -28,10 +28,10 @@ services: command: ["--config.file", "/app/config.yml"] ports: - "0.0.0.0:${MNTX_GATEWAY_GRPC_PORT:-50075}:50075" - - "0.0.0.0:${MNTX_GATEWAY_METRICS_PORT:-9404}:9404" + - "0.0.0.0:${MNTX_GATEWAY_METRICS_PORT:-9405}:9405" - "0.0.0.0:${MNTX_GATEWAY_HTTP_PORT:-8084}:8084" healthcheck: - test: ["CMD-SHELL","wget -qO- http://localhost:9404/health | grep -q '\"status\":\"ok\"'"] + test: ["CMD-SHELL","wget -qO- http://localhost:9405/health | grep -q '\"status\":\"ok\"'"] interval: 30s timeout: 10s retries: 3