update dev environment with opensearch

Author: eloiferrer

docker-compose-dev.yml

@@ -1,5 +1,5 @@
 x-elasticsearch-image: &elasticsearch-image
-  docker-registry.wikimedia.org/releng/cirrus-elasticsearch:7.10.2-s0
+  docker-registry.wikimedia.org/repos/search-platform/cirrussearch-opensearch-image:v1.3.20-12
 x-memcached: &memcached-image
   memcached:1.6.39
 x-mysql-image: &mysql-image
@@ -10,6 +10,8 @@ x-redis-jobrunner: &redis-jobrunner-image
   ghcr.io/mardi4nfdi/redis-jobrunner-staging:latest
 x-wikibase: &wikibase-image
   ghcr.io/mardi4nfdi/wikibase-staging:latest
+x-wikibase-apache: &apache-image
+  ghcr.io/mardi4nfdi/apache:1.46.3
 x-wdqs-image: &wdqs-image
   ghcr.io/wmde/wikibase/wdqs:dev-9186217118
 x-wdqs-frontend-image: &wdqs-frontend-image
@@ -49,13 +51,15 @@ volumes:
   wdqs-data:
 
 services:
-  wikibase:
-    image: *wikibase-image
-    container_name: mardi-wikibase
+  apache:
+    image: *apache-image
+    container_name: apache-wikibase
     links:
       - mysql
+      - wikibase
     depends_on:
       - mysql
+      - wikibase
     ports:
       - "8080:80"
     restart: unless-stopped
@@ -64,6 +68,17 @@ services:
       interval: 30s
       timeout: 10s
       retries: 5
+    environment:
+      <<: *wikibase_variables
+
+  wikibase:
+    image: *wikibase-image
+    container_name: mardi-wikibase
+    links:
+      - mysql
+    depends_on:
+      - mysql
+    restart: unless-stopped
     networks:
       default:
           aliases:
@@ -124,10 +139,12 @@ services:
     container_name: redis-jobrunner
     depends_on:
     - wikibase
-    entrypoint: 
+    command: 
     - php
     - /jobrunner/redisJobRunnerService
     - "--config-file=/jobrunner/config.json"
+    volumes:
+    - ./jobrunner/dev-config.json:/jobrunner/config.json:ro
     environment:
       <<: *wikibase_variables
 
@@ -136,10 +153,12 @@ services:
     container_name: redis-rescheduler
     depends_on:
     - wikibase
-    entrypoint: 
+    command: 
     - php
     - /jobrunner/redisJobChronService
     - "--config-file=/jobrunner/config.json"
+    volumes:
+    - ./jobrunner/dev-config.json:/jobrunner/config.json:ro
     environment:
       <<: *wikibase_variables
 
@@ -224,7 +243,7 @@ services:
     container_name: wikibase-setup
     restart: "no"
     depends_on:
-      wikibase:
+      apache:
         condition: service_healthy
     volumes:
       - ./dev:/setup-scripts
@@ -239,7 +258,7 @@ services:
     depends_on:
       mysql:
         condition: service_healthy
-      wikibase:
+      apache:
         condition: service_healthy
     volumes:
       - ./dev:/setup-scripts

jobrunner/dev-config.json

@@ -0,0 +1,47 @@
+{
+    "groups": {
+        "basic": {
+            "runners": 8,
+            "include": [
+                "*"
+            ],
+            "exclude": [
+                "DispatchChanges",
+                "CreateProfilePages",
+                "SetProfileType",
+                "NormalizeDoi"
+            ],
+            "low-priority": [
+                "htmlCacheUpdate"
+            ]
+        },
+        "dispChanges": {
+            "runners": 8,
+            "include": [
+                "DispatchChanges"
+            ],
+            "low-priority": [
+                "cirrusSearchElasticaWrite"
+            ]
+        },
+        "profiles": {
+            "runners": 4,
+            "include": [
+                "CreateProfilePages",
+                "SetProfileType",
+                "OpenAlex",
+                "NormalizeDoi"
+            ]
+        }
+    },
+    "limits": {},
+    "redis": {
+        "aggregators": [
+            "redis:6379"
+        ],
+        "queues": [
+            "redis:6379"
+        ]
+    },
+    "dispatcher": "/var/www/html/w/maintenance/run runJobs --type=%(type)x --maxtime=%(maxtime)x --memory-limit=%(maxmem)x --result=json --conf=/var/www/html/w/LocalSettings.php"
+}