Fix docker Plone 6 mac

rohberg · Oct 24, 2022 · 5416bee · 5416bee
1 parent 34f129f
commit 5416bee
Showing 1 changed file with 23 additions and 21 deletions.
diff --git a/docker/mac/Plone6/docker-compose.yml b/docker/mac/Plone6/docker-compose.yml
@@ -10,8 +10,9 @@ services:
       CONFIGURE_PACKAGES: "plone.app.contenttypes,plone.restapi,plone.volto,plone.volto.cors,rohberg.elasticsearchblocks,collective.elastic.plone"
       # INSTALL_PRODUCTS: "collective.elastic.plone,collective.elastic.ingest,rohberg.elasticsearchblocks"
       # ##### plone-backend docker image
-      ADDONS: "plone.app.robotframework==2.0.0a6 plone.app.testing==7.0.0a3 plone.app.contenttypes plone.restapi plone.volto celery redis collective.elastic.plone@git+https://github.com/collective/collective.elastic.plone.git collective.elastic.ingest@git+https://github.com/collective/collective.elastic.ingest.git rohberg.elasticsearchblocks@git+https://github.com/rohberg/rohberg.elasticsearchblocks"
+      ADDONS: "plone.app.robotframework==2.0.0a6 plone.app.testing==7.0.0a3 plone.app.contenttypes plone.restapi plone.volto celery redis collective.elastic.plone@git+https://github.com/collective/collective.elastic.plone.git#branch=plone6 collective.elastic.ingest@git+https://github.com/collective/collective.elastic.ingest.git#branch=plone6 rohberg.elasticsearchblocks@git+https://github.com/rohberg/rohberg.elasticsearchblocks"
       SITE: "plone"
+      DEVELOP: "git+https://github.com/collective/collective.elastic.plone.git@plone6#egg=collective.elastic.plone"
 
       CELERY_BROKER: redis://host.docker.internal:6379
       ELASTICSEARCH_INDEX: plone
@@ -33,26 +34,27 @@ services:
     ports:
       - 55001:55001
       - 8080:8080
-    # depends_on:
-    #   - redis
-    #   - elk
+    depends_on:
+      - redis
+      - elk
+    # command: tail -f /dev/null
     command: bin/robot-server plone.app.robotframework.testing.VOLTO_ROBOT_TESTING > /dev/null 2>&1 &; bin/celery -A collective.elastic.ingest.celery.app multi restart workersearchkitblock --logfile="/app/celery/celery%n%I.log" --pidfile="/app/celery/celery%n.pid" > /dev/null 2>&1 &
     volumes:
       - ../../../volumes/ploneconfiguration/:/app/ploneconfiguration/
-  # elk:
-  #   image: ksuess/rohberg-elk-mac:rc2
-  #   # image: sebp/elk:oss-8.1.0
-  #   environment:
-  #     # ES_CORS_ALLOW_ORIGIN: "/https?://(.*)localhost(.*)/"
-  #     ES_CORS_ALLOW_ORIGIN: "*"
-  #   ports:
-  #     - "5601:5601"
-  #     - "9200:9200"
-  #     - "5044:5044"
-  #   volumes:
-  #     - ./volumes/elasticsearchconfiguration/elasticsearch-keywords.txt:/etc/elasticsearch/elasticsearch-keywords.txt
-  #     - ./volumes/elasticsearchconfiguration/elasticsearch-lexicon.txt:/etc/elasticsearch/elasticsearch-lexicon.txt
-  # redis:
-  #   image: redis/redis-stack-server:latest
-  #   ports:
-  #     - 6379:6379
+  elk:
+    image: ksuess/rohberg-elk-mac:rc2
+    # image: sebp/elk:oss-8.1.0
+    environment:
+      # ES_CORS_ALLOW_ORIGIN: "/https?://(.*)localhost(.*)/"
+      ES_CORS_ALLOW_ORIGIN: "*"
+    ports:
+      - "5601:5601"
+      - "9200:9200"
+      - "5044:5044"
+    volumes:
+      - ./volumes/elasticsearchconfiguration/elasticsearch-keywords.txt:/etc/elasticsearch/elasticsearch-keywords.txt
+      - ./volumes/elasticsearchconfiguration/elasticsearch-lexicon.txt:/etc/elasticsearch/elasticsearch-lexicon.txt
+  redis:
+    image: redis/redis-stack-server:latest
+    ports:
+      - 6379:6379