fix: docker was not starting any more

theus77 · Feb 10, 2024 · 4036f3d · 4036f3d
1 parent 52d561c
commit 4036f3d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/demo/.env b/demo/.env
@@ -1,7 +1,7 @@
 # Project namespace (defaults to the current folder name if not set)
 COMPOSE_PROJECT_NAME=elasticms_demo
 
-EMS_VERSION=5.13.0
+EMS_VERSION=5.13.5
 INSTANCE_ID='ems_promo_v2_'
 EMS_BACKEND_URL=http://local.ems-demo-admin:9000
 EMS_ADMIN_URL=http://local.ems-demo-admin.localhost

diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml
@@ -82,6 +82,8 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.tika.rule=Host(`tika.localhost`)"
       - "traefik.http.routers.tika.entrypoints=web"
+      - "traefik.http.routers.tika.service=tika"
+      - "traefik.http.services.tika.loadbalancer.server.port=9998"
 
   minio:
     image: minio/minio

diff --git a/demo/docker-elasticms.yml b/demo/docker-elasticms.yml
@@ -11,29 +11,29 @@ services:
       - CONTAINER_HEAP_PERCENT=0.8
       - MAILER_URL=smtp://mailhog:1025
       - EMSCO_TIKA_SERVER=http://tika:9998
-      - EMS_BACKEND_URL=${EMS_BACKEND_URL}
-      - INSTANCE_ID=${INSTANCE_ID}
+      - EMS_BACKEND_URL=${EMS_BACKEND_URL:-~}
+      - INSTANCE_ID=${INSTANCE_ID:-demo_}
       - 'EMS_ELASTICSEARCH_HOSTS=["http://es01:9200","http://es02:9200","http://es03:9200"]'
       - REDIS_HOST=redis
       - REDIS_PORT=6379
       - DB_HOST=postgres
       - DB_DRIVER=pgsql
-      - DB_USER=${DB_USER}
-      - DB_PASSWORD=${DB_PASSWORD}
+      - DB_USER=${DB_USER:-demo}
+      - DB_PASSWORD=${DB_PASSWORD:-demo}
       - DB_PORT=5432
-      - DB_NAME=${DB_NAME}
-      - DB_SCHEMA=${DB_SCHEMA}
+      - DB_NAME=${DB_NAME:-demo}
+      - DB_SCHEMA=${DB_SCHEMA:-public}
       - S3_ACCESS_KEY_ID=accesskey
       - S3_SECRET_ACCESS_KEY=secretkey
       - S3_DEFAULT_REGION=us-east-1
       - S3_ENDPOINT_URL=http://minio:9000
-      - S3_BUCKET_NAME=${S3_BUCKET_NAME}
-      - EMSF_AUTHKEY=${EMSF_AUTHKEY}
+      - S3_BUCKET_NAME=${S3_BUCKET_NAME:-demo}
+      - EMSF_AUTHKEY=${EMSF_AUTHKEY:-~}
       - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
       - TRUSTED_HOSTS=localhost,*.localhost
       - APP_SECRET=ThisIsSecret
     volumes:
-      - ./skeleton:/opt/src/local/${INSTANCE_ID}preview
+      - ./skeleton:/opt/src/local/${INSTANCE_ID:-demo_}preview
       - ./configs/elasticms-admin:/opt/configs
       - ./configs/admin:/opt/src/admin
       - ./configs/document:/opt/src/document
@@ -55,17 +55,17 @@ services:
       - PHP_FPM_REQUEST_MAX_MEMORY_IN_MEGABYTES=64
       - CONTAINER_HEAP_PERCENT=0.8
       - MAILER_URL=smtp://mailhog:1025
-      - EMS_BACKEND_URL=${EMS_BACKEND_URL}
-      - INSTANCE_ID=${INSTANCE_ID}
-      - EMSF_AUTHKEY=${EMSF_AUTHKEY}
+      - EMS_BACKEND_URL=${EMS_BACKEND_URL:-~}
+      - INSTANCE_ID=${INSTANCE_ID:-demo_}
+      - EMSF_AUTHKEY=${EMSF_AUTHKEY:-~}
       - 'EMS_ELASTICSEARCH_HOSTS=["http://es01:9200","http://es02:9200","http://es03:9200"]'
       - REDIS_HOST=redis
       - REDIS_PORT=6379
       - S3_ACCESS_KEY_ID=accesskey
       - S3_SECRET_ACCESS_KEY=secretkey
       - S3_DEFAULT_REGION=us-east-1
       - S3_ENDPOINT_URL=http://minio:9000
-      - S3_BUCKET_NAME=${S3_BUCKET_NAME}
+      - S3_BUCKET_NAME=${S3_BUCKET_NAME:-demo}
       - TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
       - TRUSTED_HOSTS=localhost,*.localhost
       - EMSCH_ASSET_LOCAL_FOLDER=skeleton
@@ -75,8 +75,8 @@ services:
       - ./dist:/opt/src/public/skeleton:ro
       - ./configs/admin:/opt/src/admin
       - ./configs/document:/opt/src/document
-      - ./skeleton:/opt/src/local/${INSTANCE_ID}ma_preview
-      - ./skeleton:/opt/src/local/${INSTANCE_ID}ma_live
+      - ./skeleton:/opt/src/local/${INSTANCE_ID:-demo_}ma_preview
+      - ./skeleton:/opt/src/local/${INSTANCE_ID:-demo_}ma_live
       - ./skeleton:/opt/src/local/skeleton
 #      - ../elasticms-web/config:/opt/src/config
 #      - ../EMS/client-helper-bundle:/opt/src/vendor/elasticms/client-helper-bundle

diff --git a/docker/.env.dist b/docker/.env.dist
@@ -8,6 +8,9 @@ COMPOSE_PROJECT_NAME=ems-mono
 # * os2: OpenSearch 2
 ELK_VERSION=elk7
 
+# Just in order to avoid error messages
+EMS_VERSION=5.13.5
+
 ###> Cluster's variables ###
 # Set the cluster name
 CLUSTER_NAME=ems-cluster
@@ -27,7 +30,7 @@ OS2_STACK_VERSION=2.4.1
 
 ###> ELK8 variables ###
 # Version of Elastic products
-ELK8_STACK_VERSION=8.5.3
+ELK8_STACK_VERSION=8.11.3
 # Set to 'basic' or 'trial' to automatically start the 30-day trial
 ELK8_LICENSE=basic
 #ELK8_LICENSE=trial

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -105,12 +105,6 @@ services:
     container_name: ems-mono-tika
     ports:
       - "9998:9998"
-    labels:
-        - "traefik.enable=true"
-        - "traefik.http.routers.tika.rule=Host(`tika.localhost`)"
-        - "traefik.http.routers.tika.entrypoints=web"
-        - "traefik.http.routers.tika.service=tika"
-        - "traefik.http.services.tika.loadbalancer.server.port=9998"
 
   minio:
     extends: