Merge pull request #3 from FusionAuth/revert-2-docker-compose-update

Revert "Docker compose update"

Author: mark-robustelli

.env

@@ -2,7 +2,6 @@ POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 DATABASE_USERNAME=fusionauth
 DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3
-OPENSEARCH_JAVA_OPTS="-Xms512m -Xmx512m"
+ES_JAVA_OPTS="-Xms512m -Xmx512m"
 FUSIONAUTH_APP_MEMORY=512M
-FUSIONAUTH_APP_RUNTIME_MODE=development
 FUSIONAUTH_APP_KICKSTART_FILE=/usr/local/fusionauth/kickstart/kickstart.json

.github/dependabot.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   db:
-    image: postgres:16.0-bookworm
+    image: postgres:12.9
     environment:
       PGDATA: /var/lib/postgresql/data/pgdata
       POSTGRES_USER: ${POSTGRES_USER}
@@ -19,33 +19,26 @@ services:
       - db_data:/var/lib/postgresql/data
 
   search:
-    image: opensearchproject/opensearch:2.11.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0
     environment:
       cluster.name: fusionauth
+      bootstrap.memory_lock: "true"
       discovery.type: single-node
-      node.name: search
-      plugins.security.disabled: true
-      bootstrap.memory_lock: true
-      OPENSEARCH_JAVA_OPTS: ${OPENSEARCH_JAVA_OPTS}
+      ES_JAVA_OPTS: ${ES_JAVA_OPTS}
     healthcheck:
-      interval: 10s
-      retries: 80
-      test: curl --write-out 'HTTP %{http_code}' --fail --silent --output /dev/null http://localhost:9200/
+      test: [ "CMD", "curl",  "--fail" ,"--write-out", "'HTTP %{http_code}'", "--silent", "--output", "/dev/null", "http://localhost:9200/" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - search_net
     restart: unless-stopped
     ulimits:
       memlock:
         soft: -1
         hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    ports:
-      - 9200:9200 # REST API
-      - 9600:9600 # Performance Analyzer
     volumes:
-      - search_data:/usr/share/opensearch/data
-    networks:
-      - search_net
+      - search_data:/usr/share/elasticsearch/data
 
   fusionauth:
     image: fusionauth/fusionauth-app:latest
@@ -61,11 +54,12 @@ services:
       DATABASE_USERNAME: ${DATABASE_USERNAME}
       DATABASE_PASSWORD: ${DATABASE_PASSWORD}
       FUSIONAUTH_APP_MEMORY: ${FUSIONAUTH_APP_MEMORY}
-      FUSIONAUTH_APP_RUNTIME_MODE: ${FUSIONAUTH_APP_RUNTIME_MODE}
+      FUSIONAUTH_APP_RUNTIME_MODE: development
       FUSIONAUTH_APP_URL: http://fusionauth:9011
       SEARCH_SERVERS: http://search:9200
       SEARCH_TYPE: elasticsearch
       FUSIONAUTH_APP_KICKSTART_FILE: ${FUSIONAUTH_APP_KICKSTART_FILE}
+
     networks:
       - db_net
       - search_net