chore: bump start-stack to 2024.03.02 (#891)

dasch-swiss · Mar 27, 2024 · ce8d6be · ce8d6be
1 parent 8d7bb79
commit ce8d6be
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/src/dsp_tools/resources/start-stack/docker-compose.yml b/src/dsp_tools/resources/start-stack/docker-compose.yml
@@ -4,31 +4,37 @@ version: "3.7"
 
 services:
 
-  app:
-    # on the verge of every deployment (fortnightly), update the "image" value from the "app" value of
-    # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json
-    image: daschswiss/dsp-app:v11.7.3
-    ports:
-      - "4200:4200"
-    networks:
-      - knora-net
-
-  db:
-    # on the verge of every deployment (fortnightly), update the "image" value from the "db" value of
+  api:
+    # on the verge of every deployment (fortnightly), update the "image" value from the "api" value of
     # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json
-    image: daschswiss/apache-jena-fuseki:2.1.5
+    image: daschswiss/knora-api:v30.10.0
+    depends_on:
+      - sipi
+      - db
     ports:
-      - "3030:3030"
+      - "3333:3333"
     networks:
       - knora-net
     environment:
       - TZ=Europe/Zurich
-      - ADMIN_PASSWORD=test
-      - JVM_ARGS=-Xmx3G
+      - KNORA_AKKA_LOGLEVEL=DEBUG
+      - KNORA_AKKA_STDOUT_LOGLEVEL=DEBUG
+      - KNORA_WEBAPI_TRIPLESTORE_HOST=db
+      - KNORA_WEBAPI_TRIPLESTORE_DBTYPE=fuseki
+      - KNORA_WEBAPI_SIPI_INTERNAL_HOST=sipi
+      - KNORA_WEBAPI_TRIPLESTORE_FUSEKI_REPOSITORY_NAME=knora-test
+      - KNORA_WEBAPI_TRIPLESTORE_FUSEKI_USERNAME=admin
+      - KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PASSWORD=test
+      - KNORA_WEBAPI_CACHE_SERVICE_ENABLED=true
+      - KNORA_WEBAPI_CACHE_SERVICE_REDIS_HOST=redis
+      - KNORA_WEBAPI_CACHE_SERVICE_REDIS_PORT=6379
+      - KNORA_WEBAPI_ALLOW_RELOAD_OVER_HTTP=true
+      - KNORA_WEBAPI_KNORA_API_EXTERNAL_HOST=0.0.0.0
+      - KNORA_WEBAPI_KNORA_API_EXTERNAL_PORT=3333
 
   sipi:
     # on the verge of every deployment (fortnightly), take the same tag as DSP-API
-    image: daschswiss/knora-sipi:v30.9.0
+    image: daschswiss/knora-sipi:v30.10.0
     ports:
       - "1024:1024"
     volumes:
@@ -48,38 +54,32 @@ services:
       - KNORA_WEBAPI_KNORA_API_EXTERNAL_PORT=3333
     command: --config=/sipi/config/sipi.docker-config.lua
 
-  api:
-    # on the verge of every deployment (fortnightly), update the "image" value from the "api" value of
+  app:
+    # on the verge of every deployment (fortnightly), update the "image" value from the "app" value of
     # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json
-    image: daschswiss/knora-api:v30.9.0
-    depends_on:
-      - sipi
-      - db
+    image: daschswiss/dsp-app:v11.7.4
     ports:
-      - "3333:3333"
+      - "4200:4200"
+    networks:
+      - knora-net
+
+  db:
+    # on the verge of every deployment (fortnightly), update the "image" value from the "db" value of
+    # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json
+    image: daschswiss/apache-jena-fuseki:2.1.5
+    ports:
+      - "3030:3030"
     networks:
       - knora-net
     environment:
       - TZ=Europe/Zurich
-      - KNORA_AKKA_LOGLEVEL=DEBUG
-      - KNORA_AKKA_STDOUT_LOGLEVEL=DEBUG
-      - KNORA_WEBAPI_TRIPLESTORE_HOST=db
-      - KNORA_WEBAPI_TRIPLESTORE_DBTYPE=fuseki
-      - KNORA_WEBAPI_SIPI_INTERNAL_HOST=sipi
-      - KNORA_WEBAPI_TRIPLESTORE_FUSEKI_REPOSITORY_NAME=knora-test
-      - KNORA_WEBAPI_TRIPLESTORE_FUSEKI_USERNAME=admin
-      - KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PASSWORD=test
-      - KNORA_WEBAPI_CACHE_SERVICE_ENABLED=true
-      - KNORA_WEBAPI_CACHE_SERVICE_REDIS_HOST=redis
-      - KNORA_WEBAPI_CACHE_SERVICE_REDIS_PORT=6379
-      - KNORA_WEBAPI_ALLOW_RELOAD_OVER_HTTP=true
-      - KNORA_WEBAPI_KNORA_API_EXTERNAL_HOST=0.0.0.0
-      - KNORA_WEBAPI_KNORA_API_EXTERNAL_PORT=3333
+      - ADMIN_PASSWORD=test
+      - JVM_ARGS=-Xmx3G
 
   ingest:
     # on the verge of every deployment (fortnightly), update the "image" value from the "ingest" value of
     # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json
-    image: daschswiss/dsp-ingest:v0.8.0
+    image: daschswiss/dsp-ingest:v0.8.1
     ports:
       - "3340:3340"
     volumes:

diff --git a/src/dsp_tools/resources/start-stack/start-stack-config.yml b/src/dsp_tools/resources/start-stack/start-stack-config.yml
@@ -1,4 +1,4 @@
 ---
 
 # take commit hash of latest DSP-API release from https://github.com/dasch-swiss/dsp-api/commits/main
-DSP-API commit: afc1b5ae0353cda3a8d94be73c03d1ef310b40a0
+DSP-API commit: b1d5743bac951c8033ee1b6f0a6395c6a8c0c6fd