Skip to content

Commit afba37c

Browse files
Merge pull request #7 from sonderformat-llc/docker-compose-update
Docker compose update
2 parents 105f8f7 + 4c18d7e commit afba37c

3 files changed

Lines changed: 32 additions & 15 deletions

File tree

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ POSTGRES_USER=postgres
22
POSTGRES_PASSWORD=postgres
33
DATABASE_USERNAME=fusionauth
44
DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3
5-
ES_JAVA_OPTS="-Xms512m -Xmx512m"
5+
OPENSEARCH_JAVA_OPTS="-Xms512m -Xmx512m"
66
FUSIONAUTH_APP_MEMORY=512M
7-
7+
FUSIONAUTH_APP_RUNTIME_MODE=development
88
FUSIONAUTH_APP_KICKSTART_FILE=/usr/local/fusionauth/kickstart/kickstart.json

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "docker" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"

docker-compose.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '3'
22

33
services:
44
db:
5-
image: postgres:12.9
5+
image: postgres:16.0-bookworm
66
environment:
77
PGDATA: /var/lib/postgresql/data/pgdata
88
POSTGRES_USER: ${POSTGRES_USER}
@@ -19,26 +19,33 @@ services:
1919
- db_data:/var/lib/postgresql/data
2020

2121
search:
22-
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
22+
image: opensearchproject/opensearch:2.11.0
2323
environment:
2424
cluster.name: fusionauth
25-
bootstrap.memory_lock: "true"
2625
discovery.type: single-node
27-
ES_JAVA_OPTS: ${ES_JAVA_OPTS}
26+
node.name: search
27+
plugins.security.disabled: true
28+
bootstrap.memory_lock: true
29+
OPENSEARCH_JAVA_OPTS: ${OPENSEARCH_JAVA_OPTS}
2830
healthcheck:
29-
test: [ "CMD", "curl", "--fail" ,"--write-out", "'HTTP %{http_code}'", "--silent", "--output", "/dev/null", "http://localhost:9200/" ]
30-
interval: 5s
31-
timeout: 5s
32-
retries: 5
33-
networks:
34-
- search_net
31+
interval: 10s
32+
retries: 80
33+
test: curl --write-out 'HTTP %{http_code}' --fail --silent --output /dev/null http://localhost:9200/
3534
restart: unless-stopped
3635
ulimits:
3736
memlock:
3837
soft: -1
3938
hard: -1
39+
nofile:
40+
soft: 65536
41+
hard: 65536
42+
ports:
43+
- 9200:9200 # REST API
44+
- 9600:9600 # Performance Analyzer
4045
volumes:
41-
- search_data:/usr/share/elasticsearch/data
46+
- search_data:/usr/share/opensearch/data
47+
networks:
48+
- search_net
4249

4350
fusionauth:
4451
image: fusionauth/fusionauth-app:latest
@@ -54,12 +61,11 @@ services:
5461
DATABASE_USERNAME: ${DATABASE_USERNAME}
5562
DATABASE_PASSWORD: ${DATABASE_PASSWORD}
5663
FUSIONAUTH_APP_MEMORY: ${FUSIONAUTH_APP_MEMORY}
57-
FUSIONAUTH_APP_RUNTIME_MODE: development
64+
FUSIONAUTH_APP_RUNTIME_MODE: ${FUSIONAUTH_APP_RUNTIME_MODE}
5865
FUSIONAUTH_APP_URL: http://fusionauth:9011
5966
SEARCH_SERVERS: http://search:9200
6067
SEARCH_TYPE: elasticsearch
6168
FUSIONAUTH_APP_KICKSTART_FILE: ${FUSIONAUTH_APP_KICKSTART_FILE}
62-
6369
networks:
6470
- db_net
6571
- search_net

0 commit comments

Comments
 (0)