docker conflict resolved
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"]
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user