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.

Sign up for GitHub

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

Update docker for default admin creds update #114

Merged
merged 5 commits into from
Feb 6, 2024
Merged

Update docker for default admin creds update #114

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f2e618
Update docker for default admin creds update
derek-ho Dec 29, 2023
41532a3
Add env variable
derek-ho Jan 18, 2024
31fe560
Add helpful comment
derek-ho Jan 18, 2024
405586b
use env variable
derek-ho Jan 18, 2024
a65db4c
Merge branch 'main' into admin
derek-ho Feb 6, 2024
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
3 changes: 2 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
environment:
- CURRENCY_SERVICE_PORT
- OTEL_EXPORTER_OTLP_ENDPOINT
- OTEL_RESOURCE_ATTRIBUTES=${OTEL_RESOURCE_ATTRIBUTES},service.name=currencyservice # The C++ SDK does not support OTEL_SERVICE_NAME

Check warning on line 178 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

178:91 [comments] too few spaces before comment

Check warning on line 178 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

178:91 [comments] too few spaces before comment
depends_on:
otelcol:
condition: service_started
Expand Down Expand Up @@ -222,8 +222,8 @@
memory: 175M
restart: unless-stopped
ports:
- "${FEATURE_FLAG_SERVICE_PORT}:${FEATURE_FLAG_SERVICE_PORT}" # Feature Flag Service UI

Check warning on line 225 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

225:69 [comments] too few spaces before comment

Check warning on line 225 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

225:69 [comments] too few spaces before comment
- "${FEATURE_FLAG_GRPC_SERVICE_PORT}" # Feature Flag Service gRPC API

Check warning on line 226 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

226:45 [comments] too few spaces before comment

Check warning on line 226 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

226:45 [comments] too few spaces before comment
environment:
- FEATURE_FLAG_SERVICE_PORT
- FEATURE_FLAG_GRPC_SERVICE_PORT
Expand Down Expand Up @@ -614,8 +614,8 @@
memory: 300M
restart: unless-stopped
ports:
- "${JAEGER_SERVICE_PORT}" # Jaeger UI

Check warning on line 617 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

617:34 [comments] too few spaces before comment

Check warning on line 617 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

617:34 [comments] too few spaces before comment
- "4317" # OTLP gRPC default port

Check warning on line 618 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

618:16 [comments] too few spaces before comment

Check warning on line 618 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

618:16 [comments] too few spaces before comment
- "14269:14269"
- "14268:14268"
- "14267:14267"
Expand All @@ -627,7 +627,7 @@
- SPAN_STORAGE_TYPE=opensearch
- ES_TAGS_AS_FIELDS_ALL=true
- ES_USERNAME=admin
- ES_PASSWORD=admin
- ES_PASSWORD=myStrongPassword123!
- ES_TLS_SKIP_HOST_VERIFY=true
logging: *logging
depends_on:
Expand Down Expand Up @@ -685,11 +685,11 @@
- ./src/otelcollector/otelcol-config.yml:/etc/otelcol-config.yml
- ./src/otelcollector/otelcol-config-extras.yml:/etc/otelcol-config-extras.yml
ports:
- "4317" # OTLP over gRPC receiver

Check warning on line 688 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

688:16 [comments] too few spaces before comment

Check warning on line 688 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

688:16 [comments] too few spaces before comment
- "4318:4318" # OTLP over HTTP receiver

Check warning on line 689 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

689:21 [comments] too few spaces before comment

Check warning on line 689 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

689:21 [comments] too few spaces before comment
- "13133:13133" # health check port

Check warning on line 690 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

690:23 [comments] too few spaces before comment

Check warning on line 690 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

690:23 [comments] too few spaces before comment
- "9464" # Prometheus exporter

Check warning on line 691 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

691:16 [comments] too few spaces before comment

Check warning on line 691 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

691:16 [comments] too few spaces before comment
- "8888" # metrics endpoint

Check warning on line 692 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

692:16 [comments] too few spaces before comment

Check warning on line 692 in docker-compose.yml

View workflow job for this annotation

GitHub Actions / yamllint 

692:16 [comments] too few spaces before comment
depends_on:
- jaeger-agent
- data-prepper
Expand Down Expand Up @@ -732,6 +732,7 @@
- cluster.initial_cluster_manager_nodes=opensearch
- bootstrap.memory_lock=true
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m"
- "OPENSEARCH_INITIAL_ADMIN_PASSWORD=myStrongPassword123!"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use an env var for this field

ulimits:
memlock:
soft: -1
Expand Down
Loading