Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change docker compose services to restart unless stopped #690

Merged
merged 3 commits into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#687](https://github.com/open-telemetry/opentelemetry-demo/pull/687))
* Remove grpc from loadgenerator
([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688))
* Update docker-compose services to restart unless stopped
([#690](https://github.com/open-telemetry/opentelemetry-demo/pull/690))
40 changes: 20 additions & 20 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:
resources:
limits:
memory: 20M
restart: always
restart: unless-stopped
environment:
- KAFKA_SERVICE_ADDR
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
Expand Down Expand Up @@ -69,7 +69,7 @@ services:
resources:
limits:
memory: 300M
restart: always
restart: unless-stopped
ports:
- "${AD_SERVICE_PORT}"
environment:
Expand All @@ -96,7 +96,7 @@ services:
resources:
limits:
memory: 160M
restart: always
restart: unless-stopped
ports:
- "${CART_SERVICE_PORT}"
environment:
Expand Down Expand Up @@ -124,7 +124,7 @@ services:
resources:
limits:
memory: 20M
restart: always
restart: unless-stopped
ports:
- "${CHECKOUT_SERVICE_PORT}"
environment:
Expand Down Expand Up @@ -175,7 +175,7 @@ services:
resources:
limits:
memory: 20M
restart: always
restart: unless-stopped
ports:
- "${CURRENCY_SERVICE_PORT}"
environment:
Expand All @@ -198,7 +198,7 @@ services:
resources:
limits:
memory: 100M
restart: always
restart: unless-stopped
ports:
- "${EMAIL_SERVICE_PORT}"
environment:
Expand All @@ -224,7 +224,7 @@ services:
resources:
limits:
memory: 200M
restart: always
restart: unless-stopped
ports:
- "${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI
- "${FEATURE_FLAG_GRPC_SERVICE_PORT}" # Feature Flag Service gRPC API
Expand Down Expand Up @@ -254,7 +254,7 @@ services:
resources:
limits:
memory: 200M
restart: always
restart: unless-stopped
environment:
- KAFKA_SERVICE_ADDR
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
Expand Down Expand Up @@ -282,7 +282,7 @@ services:
resources:
limits:
memory: 200M
restart: always
restart: unless-stopped
ports:
- "${FRONTEND_PORT}"
environment:
Expand Down Expand Up @@ -357,7 +357,7 @@ services:
resources:
limits:
memory: 120M
restart: always
restart: unless-stopped
ports:
- "${LOCUST_WEB_PORT}"
environment:
Expand Down Expand Up @@ -387,7 +387,7 @@ services:
resources:
limits:
memory: 70M
restart: always
restart: unless-stopped
ports:
- "${PAYMENT_SERVICE_PORT}"
environment:
Expand All @@ -414,7 +414,7 @@ services:
resources:
limits:
memory: 20M
restart: always
restart: unless-stopped
ports:
- "${PRODUCT_CATALOG_SERVICE_PORT}"
environment:
Expand Down Expand Up @@ -442,7 +442,7 @@ services:
resources:
limits:
memory: 30M
restart: always
restart: unless-stopped
ports:
- "${QUOTE_SERVICE_PORT}"
environment:
Expand All @@ -468,7 +468,7 @@ services:
resources:
limits:
memory: 500M # This is high to enable supporting the recommendationCache feature flag use case
restart: always
restart: unless-stopped
ports:
- "${RECOMMENDATION_SERVICE_PORT}"
environment:
Expand Down Expand Up @@ -502,7 +502,7 @@ services:
resources:
limits:
memory: 20M
restart: always
restart: unless-stopped
ports:
- "${SHIPPING_SERVICE_PORT}"
environment:
Expand All @@ -527,7 +527,7 @@ services:
resources:
limits:
memory: 200M
restart: always
restart: unless-stopped
environment:
- POSTGRES_USER=ffs
- POSTGRES_DB=ffs
Expand All @@ -552,7 +552,7 @@ services:
resources:
limits:
memory: 800M
restart: always
restart: unless-stopped
environment:
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://kafka:9092
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
Expand All @@ -577,7 +577,7 @@ services:
resources:
limits:
memory: 20M
restart: always
restart: unless-stopped
ports:
- "${REDIS_PORT}"
logging: *logging
Expand All @@ -601,7 +601,7 @@ services:
resources:
limits:
memory: 275M
restart: always
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI
- "4317" # OTLP gRPC default port
Expand Down Expand Up @@ -629,7 +629,7 @@ services:
resources:
limits:
memory: 100M
restart: always
restart: unless-stopped
command: [ "--config=/etc/otelcol-config.yml", "--config=/etc/otelcol-config-extras.yml" ]
volumes:
- ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
Expand Down