From 6d203542e9b6629f58782ea2798d1f3400aca0ff Mon Sep 17 00:00:00 2001 From: pmacius Date: Thu, 24 Oct 2024 16:58:59 +0200 Subject: [PATCH] review --- .../workflows/docker-compose-community.yml | 4 +- .../workflows/docker-compose-enterprise.yml | 4 +- docker-compose/7.1.N-compose.yaml | 17 ++++++--- docker-compose/7.2.N-compose.yaml | 19 +++++++--- docker-compose/7.3.N-compose.yaml | 19 +++++++--- docker-compose/7.4.N-compose.yaml | 19 +++++++--- docker-compose/community-compose.yaml | 7 +++- docker-compose/compose.yaml | 37 ++++++++++++------- docker-compose/pre-release-compose.yaml | 33 +++++++++++------ 9 files changed, 106 insertions(+), 53 deletions(-) diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml index e919edd63..4e5adfff6 100644 --- 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 index 861752ca3..ca461b056 100644 --- 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 index 85fc645bc..e96efa5c3 100644 --- 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 index 008a26658..e0e3ba9ca 100644 --- 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 index c12246e8a..412040e0c 100644 --- 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 index 1fcc7b0c6..b97617369 100644 --- 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 index b4614adef..f2801d8e0 100644 --- 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`)" diff --git a/docker-compose/compose.yaml b/docker-compose/compose.yaml index 163f574c0..c40f1e1fc 100644 --- a/docker-compose/compose.yaml +++ b/docker-compose/compose.yaml @@ -82,13 +82,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 @@ -104,12 +106,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 @@ -124,7 +128,7 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8099/ready"] interval: 20s - timeout: 10s + timeout: 2s retries: 3 start_period: 10s volumes: @@ -147,9 +151,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`)" @@ -209,17 +216,12 @@ services: healthcheck: test: ["CMD-SHELL", "curl -f http://localhost:5601/status"] interval: 10s - timeout: 10s + timeout: 2s retries: 5 start_period: 30s search: image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.1.0 mem_limit: 1g - depends_on: - elasticsearch: - condition: service_healthy - transform-core-aio: - condition: service_healthy environment: ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >- http://transform-core-aio:8090/transform/config @@ -230,9 +232,16 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"] interval: 20s - timeout: 20s + timeout: 2s retries: 3 start_period: 20s + depends_on: + elasticsearch: + condition: service_healthy + transform-core-aio: + condition: service_healthy + shared-file-store: + condition: service_healthy search-reindexing: image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.1.0 mem_limit: 1g @@ -278,7 +287,7 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8081/actuator/health/readiness"] interval: 60s - timeout: 10s + timeout: 2s retries: 3 start_period: 15s depends_on: @@ -376,7 +385,7 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"] interval: 30s - timeout: 10s + timeout: 2s retries: 3 start_period: 20s depends_on: diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml index 7a0b78879..12330feb8 100644 --- a/docker-compose/pre-release-compose.yaml +++ b/docker-compose/pre-release-compose.yaml @@ -82,13 +82,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.5-A1 mem_limit: 1536m @@ -104,12 +106,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.5-A1 mem_limit: 512m @@ -124,7 +128,7 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8099/ready"] interval: 20s - timeout: 10s + timeout: 2s retries: 3 start_period: 10s volumes: @@ -147,9 +151,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`)" @@ -199,11 +206,6 @@ services: search: image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.1.0 mem_limit: 1g - depends_on: - elasticsearch: - condition: service_healthy - transform-core-aio: - condition: service_healthy environment: ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >- http://transform-core-aio:8090/transform/config @@ -214,9 +216,16 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8080/actuator/health"] interval: 20s - timeout: 20s + timeout: 2s retries: 3 start_period: 20s + depends_on: + elasticsearch: + condition: service_healthy + transform-core-aio: + condition: service_healthy + shared-file-store: + condition: service_healthy search-reindexing: image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.1.0 mem_limit: 1g @@ -340,7 +349,7 @@ services: healthcheck: test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"] interval: 30s - timeout: 10s + timeout: 2s retries: 3 start_period: 20s depends_on: