review

Alfresco · Oct 24, 2024 · 6d20354 · 6d20354
1 parent a52979d
commit 6d20354
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 53 deletions.
diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml
@@ -22,6 +22,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v8.0.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v8.1.0
         with:
           compose_file_path: docker-compose/community-compose.yaml
+          postman_path: test/postman/docker-compose
+          postman_json: acs-test-docker-compose-collection.json
diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml
@@ -55,9 +55,11 @@ jobs:
     steps:
       - name: Verify docker-compose
         uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v8.0.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v8.1.0
         timeout-minutes: 10
         with:
+          postman_path: test/postman/docker-compose
+          postman_json: acs-test-docker-compose-collection.json
           compose_file_path: docker-compose/${{ matrix.compose_file }}
           quay_username: ${{ secrets.QUAY_USERNAME }}
           quay_password: ${{ secrets.QUAY_PASSWORD }}
diff --git a/docker-compose/7.1.N-compose.yaml b/docker-compose/7.1.N-compose.yaml
@@ -88,13 +88,15 @@ services:
       - "8095:8095"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8095/actuator/health"]
-      interval: 60s
-      timeout: 10s
+      interval: 10s
+      timeout: 2s
       retries: 3
       start_period: 20s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   transform-core-aio:
     image: alfresco/alfresco-transform-core-aio:3.1.2
     mem_limit: 1536m
@@ -117,6 +119,8 @@ services:
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   shared-file-store:
     image: quay.io/alfresco/alfresco-shared-file-store:2.1.2
     mem_limit: 512m
@@ -132,7 +136,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8099/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     volumes:
@@ -156,9 +160,12 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/share"]
       interval: 20s
-      timeout: 5s
+      timeout: 2s
       retries: 3
       start_period: 15s
+    depends_on:
+      alfresco:
+        condition: service_healthy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.share.rule=PathPrefix(`/share`)"
@@ -279,7 +286,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"]
       interval: 30s
-      timeout: 10s
+      timeout: 2s
       retries: 5
       start_period: 40s
     depends_on:

diff --git a/docker-compose/7.2.N-compose.yaml b/docker-compose/7.2.N-compose.yaml
@@ -89,13 +89,15 @@ services:
       - "8095:8095"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8095/actuator/health"]
-      interval: 60s
-      timeout: 10s
+      interval: 10s
+      timeout: 2s
       retries: 3
       start_period: 20s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   transform-core-aio:
     image: alfresco/alfresco-transform-core-aio:3.1.2
     mem_limit: 1536m
@@ -112,12 +114,14 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8090/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   shared-file-store:
     image: quay.io/alfresco/alfresco-shared-file-store:2.1.2
     mem_limit: 512m
@@ -135,7 +139,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8099/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
   share:
@@ -157,9 +161,12 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/share"]
       interval: 20s
-      timeout: 5s
+      timeout: 2s
       retries: 3
       start_period: 15s
+    depends_on:
+      alfresco:
+        condition: service_healthy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.share.rule=PathPrefix(`/share`)"
@@ -305,7 +312,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"]
       interval: 30s
-      timeout: 10s
+      timeout: 2s
       retries: 5
       start_period: 40s
     depends_on:

diff --git a/docker-compose/7.3.N-compose.yaml b/docker-compose/7.3.N-compose.yaml
@@ -84,13 +84,15 @@ services:
       - "8095:8095"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8095/actuator/health"]
-      interval: 60s
-      timeout: 10s
+      interval: 10s
+      timeout: 2s
       retries: 3
       start_period: 20s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   transform-core-aio:
     image: alfresco/alfresco-transform-core-aio:3.1.2
     mem_limit: 1536m
@@ -106,12 +108,14 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8090/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   shared-file-store:
     image: quay.io/alfresco/alfresco-shared-file-store:2.1.2
     mem_limit: 512m
@@ -126,7 +130,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8099/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     volumes:
@@ -149,9 +153,12 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/share"]
       interval: 20s
-      timeout: 5s
+      timeout: 2s
       retries: 3
       start_period: 15s
+    depends_on:
+      alfresco:
+        condition: service_healthy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.share.rule=PathPrefix(`/share`)"
@@ -295,7 +302,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"]
       interval: 30s
-      timeout: 10s
+      timeout: 2s
       retries: 5
       start_period: 40s
     depends_on:

diff --git a/docker-compose/7.4.N-compose.yaml b/docker-compose/7.4.N-compose.yaml
@@ -84,13 +84,15 @@ services:
       - "8095:8095"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8095/actuator/health"]
-      interval: 60s
-      timeout: 10s
+      interval: 10s
+      timeout: 2s
       retries: 3
       start_period: 20s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   transform-core-aio:
     image: alfresco/alfresco-transform-core-aio:5.1.4
     mem_limit: 1536m
@@ -106,12 +108,14 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8090/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     depends_on:
       activemq:
         condition: service_healthy
+      shared-file-store:
+        condition: service_healthy
   shared-file-store:
     image: quay.io/alfresco/alfresco-shared-file-store:4.1.4
     mem_limit: 512m
@@ -126,7 +130,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8099/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     volumes:
@@ -149,9 +153,12 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/share"]
       interval: 20s
-      timeout: 5s
+      timeout: 2s
       retries: 3
       start_period: 15s
+    depends_on:
+      alfresco:
+        condition: service_healthy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.share.rule=PathPrefix(`/share`)"
@@ -296,7 +303,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"]
       interval: 30s
-      timeout: 10s
+      timeout: 2s
       retries: 5
       start_period: 40s
     depends_on:

diff --git a/docker-compose/community-compose.yaml b/docker-compose/community-compose.yaml
@@ -69,7 +69,7 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8090/ready"]
       interval: 20s
-      timeout: 10s
+      timeout: 2s
       retries: 3
       start_period: 10s
     depends_on:
@@ -93,9 +93,12 @@ services:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:8080/share"]
       interval: 20s
-      timeout: 5s
+      timeout: 2s
       retries: 3
       start_period: 15s
+    depends_on:
+      alfresco:
+        condition: service_healthy
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.share.rule=PathPrefix(`/share`)"