diff --git a/docker/docker-compose-examples/single-node-debug-mode/docker-compose.yml b/docker/docker-compose-examples/single-node-debug-mode/docker-compose.yml index 16c458375039..8f5b33c3f861 100644 --- a/docker/docker-compose-examples/single-node-debug-mode/docker-compose.yml +++ b/docker/docker-compose-examples/single-node-debug-mode/docker-compose.yml @@ -11,14 +11,13 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1.3.6 + image: opensearchproject/opensearch:1 environment: - cluster.name=elastic-cluster - discovery.type=single-node - data - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -73,4 +72,3 @@ services: - dbdata:/var/lib/postgresql/data networks: - db_net - diff --git a/docker/docker-compose-examples/single-node-demo-site/docker-compose.yml b/docker/docker-compose-examples/single-node-demo-site/docker-compose.yml index e56adfb1769a..6eb69f3dc15d 100644 --- a/docker/docker-compose-examples/single-node-demo-site/docker-compose.yml +++ b/docker/docker-compose-examples/single-node-demo-site/docker-compose.yml @@ -11,14 +11,13 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1.3.6 + image: opensearchproject/opensearch:1 environment: - cluster.name=elastic-cluster - discovery.type=single-node - data - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -72,5 +71,3 @@ services: - dbdata:/var/lib/postgresql/data networks: - db_net - - diff --git a/docker/docker-compose-examples/single-node/docker-compose.yml b/docker/docker-compose-examples/single-node/docker-compose.yml index 2ec0d9f32d2c..1c421277f58e 100644 --- a/docker/docker-compose-examples/single-node/docker-compose.yml +++ b/docker/docker-compose-examples/single-node/docker-compose.yml @@ -11,14 +11,13 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1.3.6 + image: opensearchproject/opensearch:1 environment: - cluster.name=elastic-cluster - discovery.type=single-node - data - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -72,4 +71,3 @@ services: - dbdata:/var/lib/postgresql/data networks: - db_net - diff --git a/docker/docker-compose-examples/with-kibana/docker-compose.yml b/docker/docker-compose-examples/with-kibana/docker-compose.yml deleted file mode 100644 index 81e6e137d999..000000000000 --- a/docker/docker-compose-examples/with-kibana/docker-compose.yml +++ /dev/null @@ -1,73 +0,0 @@ -version: '3.5' - -networks: - db_net: - es_net: - -volumes: - cms-shared: - dbdata: - esdata: - -services: - elasticsearch: - image: opensearchproject/opensearch:1.3.6 - environment: - - cluster.name=elastic-cluster - - discovery.type=single-node - - data - - bootstrap.memory_lock=true - - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true - ports: - - 9200:9200 - - 9600:9600 - volumes: - - esdata:/usr/share/elasticsearch/data - networks: - - es_net - - kibana: - image: docker.elastic.co/kibana/kibana:7.9.1 - environment: - ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]' - ports: - - "5601:5601" - networks: - - es_net - - dotcms: - image: dotcms/dotcms:latest - environment: - DB_BASE_URL: "jdbc:postgresql://db/dotcms" - DB_USERNAME: 'dotcmsdbuser' - DB_PASSWORD: 'password' - DOT_ES_AUTH_BASIC_PASSWORD: 'admin' - DOT_ES_ENDPOINTS: 'http://elasticsearch:9200' - DOT_INITIAL_ADMIN_PASSWORD: 'admin' - DOT_DOTCMS_CLUSTER_ID: 'dotcms-production' - #"CUSTOM_STARTER_URL": 'https://repo.dotcms.com/artifactory/libs-release-local/com/dotcms/starter/20220713/starter-20220713.zip' - depends_on: - - elasticsearch - - db - volumes: - #- {local_data_path}:/data/shared - - {license_local_path}/license.zip:/data/shared/assets/license.zip - networks: - - db_net - - es_net - ports: - - "8080:8080" - - "8443:8443" - - db: - image: postgres:11 - command: postgres -c 'max_connections=400' -c 'shared_buffers=128MB' - environment: - "POSTGRES_USER": 'dotcmsdbuser' - "POSTGRES_PASSWORD": 'password' - "POSTGRES_DB": 'dotcms' - volumes: - - dbdata:/var/lib/postgresql/data - networks: - - db_net diff --git a/docker/docker-compose-examples/with-opensearch-dashboard/docker-compose.yml b/docker/docker-compose-examples/with-opensearch-dashboard/docker-compose.yml index 0be9dd9992a0..9ef22460fcb2 100644 --- a/docker/docker-compose-examples/with-opensearch-dashboard/docker-compose.yml +++ b/docker/docker-compose-examples/with-opensearch-dashboard/docker-compose.yml @@ -11,14 +11,13 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1.3.6 + image: opensearchproject/opensearch:1 environment: - cluster.name=elastic-cluster - discovery.type=single-node - data - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -35,7 +34,7 @@ services: - opensearch-net dashboard: - image: opensearchproject/opensearch-dashboards:1.3.6 + image: opensearchproject/opensearch-dashboards:1 environment: OPENSEARCH_HOSTS: '["https://opensearch:9200"]' ports: @@ -81,4 +80,3 @@ services: - dbdata:/var/lib/postgresql/data networks: - db_net - diff --git a/docker/docker-compose-examples/with-redis-session/docker-compose-node-1.yml b/docker/docker-compose-examples/with-redis-session/docker-compose-node-1.yml index ea3e578fe008..a0653f4cdd5d 100644 --- a/docker/docker-compose-examples/with-redis-session/docker-compose-node-1.yml +++ b/docker/docker-compose-examples/with-redis-session/docker-compose-node-1.yml @@ -12,14 +12,13 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1.3.6 + image: opensearchproject/opensearch:1 environment: - cluster.name=elastic-cluster - discovery.type=single-node - data - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -88,4 +87,4 @@ services: volumes: - dbdata:/var/lib/postgresql/data networks: - - db_net \ No newline at end of file + - db_net diff --git a/docker/docker-compose-examples/with-redis/docker-compose-node-1.yml b/docker/docker-compose-examples/with-redis/docker-compose-node-1.yml index e2e20de44053..b13b1d416fcd 100644 --- a/docker/docker-compose-examples/with-redis/docker-compose-node-1.yml +++ b/docker/docker-compose-examples/with-redis/docker-compose-node-1.yml @@ -12,14 +12,13 @@ volumes: services: opensearch: - image: opensearchproject/opensearch:1.3.6 + image: opensearchproject/opensearch:1 environment: - cluster.name=elastic-cluster - discovery.type=single-node - data - bootstrap.memory_lock=true - "OPENSEARCH_JAVA_OPTS=-Xmx1G " - - plugins.security.disabled=true ulimits: memlock: soft: -1 # Set memlock to unlimited (no soft or hard limit) @@ -86,4 +85,3 @@ services: - dbdata:/var/lib/postgresql/data networks: - db_net -