Skip to content

Commit 490d8a3

Browse files
authored
Merge branch 'main' into mfarina1-readme-updates
2 parents d46a7cb + 630f0e3 commit 490d8a3

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ DB_NAME=amp_core
3939
DB_HEALTHCHECK_USER=healthcheck
4040
DB_HEALTHCHECK_PASSWORD=healthcheck
4141

42+
OPENSEARCH_INITIAL_ADMIN_PASSWORD=Bw1YckbI3jroOxVnaQHm
43+
4244
GRAFANA_CONTAINER_PORT=3000
4345
GRAFANA_HOST_PORT=grafana:${GRAFANA_CONTAINER_PORT}
4446
GRAFANA_PROXIES_PATH=localhost/grafana

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ testresults.xml
2020
# local build files
2121
/anms-core/build/
2222
/anms-ui/release/
23+
docker-compose.override.yml
2324

2425
# Javascript and ESLint related content to be ignored
2526
node_modules

docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,15 @@ services:
8181
opensearch:
8282
profiles: ["full"]
8383
hostname: opensearch
84-
image: docker.io/opensearchproject/opensearch:2.0.0
84+
image: docker.io/opensearchproject/opensearch:2.19.5
8585
restart: unless-stopped
8686
security_opt:
8787
- "label=type:opensearch.process"
8888
environment:
8989
- discovery.type=single-node
9090
- bootstrap.memory_lock=true # along with the memlock settings below, disables swapping
9191
- "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
92+
- "OPENSEARCH_INITIAL_ADMIN_PASSWORD=${OPENSEARCH_INITIAL_ADMIN_PASSWORD}"
9293
# privileged: true # doesn't work
9394
# ulimits: # acuses permission error
9495
# memlock:
@@ -106,7 +107,7 @@ services:
106107
opensearch-dashboards:
107108
profiles: ["full"]
108109
hostname: opensearch-dashboards
109-
image: docker.io/opensearchproject/opensearch-dashboards:2.0.0
110+
image: docker.io/opensearchproject/opensearch-dashboards:2.19.5
110111
restart: unless-stopped
111112
security_opt:
112113
- "label=type:opensearch-dashboards.process"

0 commit comments

Comments
 (0)