Merge branch 'master' into OPSEXP-2673

Alfresco · May 31, 2024 · a2a3706 · a2a3706
2 parents 69243e4 + 7fbf7b0
commit a2a3706
Show file tree

Hide file tree

Showing 24 changed files with 129 additions and 114 deletions.
diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml
@@ -32,7 +32,7 @@ jobs:
     name: Helm charts dependencies
     if: inputs.update-type == 'charts'
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
@@ -44,17 +44,17 @@ jobs:
           password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Install Updatecli
-        uses: updatecli/updatecli-action@9b35aa663a924d5d5faf89dac76594e3034bcf1f  # v2.56.0
+        uses: updatecli/updatecli-action@fa41baa922561b436c449de1a0bd1f5bd768248c  # v2.58.0
         with:
           version: ${{ env.UPDATE_CLI_VERSION }}
 
       - run: updatecli apply
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.23.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.27.0
       - name: Regenerate helm docs if necessary
-        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.23.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.27.0
         with:
           pre-commit-args: helm-docs || true
           skip_checkout: "true"
@@ -76,17 +76,17 @@ jobs:
     if: inputs.update-type == 'values'
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
       - name: Install Updatecli
-        uses: updatecli/updatecli-action@9b35aa663a924d5d5faf89dac76594e3034bcf1f  # v2.56.0
+        uses: updatecli/updatecli-action@fa41baa922561b436c449de1a0bd1f5bd768248c  # v2.58.0
         with:
           version: ${{ env.UPDATE_CLI_VERSION }}
 
       - name: Checkout updatecli configs
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           repository: alfresco/alfresco-updatecli
           ref: ${{ inputs.alfresco-updatecli-ref || env.DEFAULT_BRANCH_NAME }}
@@ -107,9 +107,9 @@ jobs:
           QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
           UPDATECLI_GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
 
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.23.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.27.0
       - name: Regenerate helm docs if necessary
-        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.23.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.27.0
         with:
           pre-commit-args: helm-docs || true
           skip_checkout: "true"

diff --git a/.github/workflows/docker-compose-community.yml b/.github/workflows/docker-compose-community.yml
@@ -22,6 +22,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.27.0
         with:
           compose_file_path: docker-compose/community-docker-compose.yml
diff --git a/.github/workflows/docker-compose-enterprise.yml b/.github/workflows/docker-compose-enterprise.yml
@@ -27,7 +27,7 @@ jobs:
     outputs:
       matrix_json: ${{ steps.eval.outputs.matrix_json }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
       - name: Evaluate Matrix
         id: eval
         run: >-
@@ -55,7 +55,7 @@ jobs:
     steps:
       - name: Verify docker-compose
         uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/verify-compose@v5.27.0
         timeout-minutes: 10
         with:
           compose_file_path: docker-compose/${{ matrix.compose_file }}

diff --git a/.github/workflows/helm-community.yml b/.github/workflows/helm-community.yml
@@ -24,7 +24,7 @@ jobs:
     outputs:
       ver_json: ${{ steps.app_versions.outputs.json }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           fetch-depth: 0
       - name: Get charts
@@ -54,7 +54,7 @@ jobs:
       matrix:
         include: ${{ fromJSON(needs.build_vars.outputs.ver_json) }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
 
       - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814  # v4.2.0
         with:
@@ -68,7 +68,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.23.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.27.0
         with:
           ingress-nginx-ref: controller-v1.8.2
 

diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
@@ -30,7 +30,7 @@ jobs:
     outputs:
       ver_json: ${{ steps.app_versions.outputs.json }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           fetch-depth: 0
       - name: Get charts
@@ -64,7 +64,7 @@ jobs:
       matrix:
         include: ${{ fromJSON(needs.build_vars.outputs.ver_json) }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
 
       - uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814
         with:
@@ -84,7 +84,7 @@ jobs:
           password: ${{ secrets.QUAY_PASSWORD }}
 
       - name: Setup cluster
-        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.23.0
+        uses: Alfresco/alfresco-build-tools/.github/actions/setup-kind@v5.27.0
         with:
           ingress-nginx-ref: controller-v1.8.2
           metrics: "true"

diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml
@@ -10,7 +10,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           fetch-depth: 0
 
@@ -20,7 +20,7 @@ jobs:
 
       - name: Publish chart
         uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/dbp-charts/publish-chart@v5.27.0
         with:
           chart_name: alfresco-content-services
           github_token: ${{ secrets.BOT_GITHUB_TOKEN }}

diff --git a/.github/workflows/helm-static-checks.yml b/.github/workflows/helm-static-checks.yml
@@ -21,7 +21,7 @@ jobs:
       app_charts: ${{ steps.getcharts.outputs.app }}
       lib_charts: ${{ steps.getcharts.outputs.lib }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
         with:
           fetch-depth: 2
       - id: getcharts
@@ -38,13 +38,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.27.0
         with:
           chart-dir: helm/${{ matrix.charts.name }}
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-plugin@v5.27.0
         with:
           plugin_url: https://github.com/helm-unittest/helm-unittest
       - name: Run Helm unit tests if present
@@ -61,13 +61,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # v4.1.4
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # v4.1.6
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-build-chart@v5.27.0
         with:
           chart-dir: helm/${{ matrix.charts.name }}
       - uses: >-
-          Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v5.23.0
+          Alfresco/alfresco-build-tools/.github/actions/helm-template-yamllint@v5.27.0
         with:
           chart-dir: helm/${{ matrix.charts.name }}
           helm-options: >-

diff --git a/.github/workflows/pre-commit-compose.yml b/.github/workflows/pre-commit-compose.yml
@@ -24,4 +24,4 @@ jobs:
     name: Run pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.23.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/pre-commit@v5.27.0
diff --git a/.github/workflows/pre-commit-helm.yml b/.github/workflows/pre-commit-helm.yml
@@ -27,8 +27,8 @@ jobs:
     name: Run pre-commit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b  # 4.1.4
-      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.23.0
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29  # 4.1.6
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-helm-docs@v5.27.0
       - name: Add dependency chart repos
         run: |
           for repo in $(yq eval-all \

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -123,17 +123,32 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rouge (4.2.1)
     ruby-rc4 (0.1.5)
     safe_yaml (1.0.5)
-    sass-embedded (1.77.1)
+    sass-embedded (1.77.1-aarch64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-aarch64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-arm-linux-gnueabihf)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-arm-linux-musleabihf)
       google-protobuf (>= 3.25, < 5.0)
-      rake (>= 13.0.0)
     sass-embedded (1.77.1-arm64-darwin)
       google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-x86-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-x86-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
     sass-embedded (1.77.1-x86_64-darwin)
       google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-x86_64-linux-gnu)
+      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.77.1-x86_64-linux-musl)
+      google-protobuf (>= 3.25, < 5.0)
+    strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     timers (4.3.5)

diff --git a/docker-compose/7.2.N-docker-compose.yml b/docker-compose/7.2.N-docker-compose.yml
@@ -21,7 +21,7 @@
 version: "2"
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:7.2.1.15
+    image: quay.io/alfresco/alfresco-content-repository:7.2.2
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -106,7 +106,7 @@ services:
     volumes:
       - shared-file-store-volume:/tmp/Alfresco/sfs
   share:
-    image: quay.io/alfresco/alfresco-share:7.2.1.15
+    image: quay.io/alfresco/alfresco-share:7.2.2
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"

diff --git a/docker-compose/7.3.N-docker-compose.yml b/docker-compose/7.3.N-docker-compose.yml
@@ -18,7 +18,7 @@
 version: "2"
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:7.3.1.2
+    image: quay.io/alfresco/alfresco-content-repository:7.3.2
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -99,7 +99,7 @@ services:
     volumes:
       - shared-file-store-volume:/tmp/Alfresco/sfs
   share:
-    image: quay.io/alfresco/alfresco-share:7.3.1.2
+    image: quay.io/alfresco/alfresco-share:7.3.2
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"

diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml
@@ -18,7 +18,7 @@
 version: "2"
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:7.4.1.6
+    image: quay.io/alfresco/alfresco-content-repository:7.4.2
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -58,7 +58,7 @@ services:
         -XX:MaxRAMPercentage=80
   transform-router:
     mem_limit: 512m
-    image: quay.io/alfresco/alfresco-transform-router:4.1.1
+    image: quay.io/alfresco/alfresco-transform-router:4.1.2
     environment:
       JAVA_OPTS: >-
         -XX:MinRAMPercentage=50
@@ -72,7 +72,7 @@ services:
     links:
       - activemq
   transform-core-aio:
-    image: alfresco/alfresco-transform-core-aio:5.1.1
+    image: alfresco/alfresco-transform-core-aio:5.1.2
     mem_limit: 1536m
     environment:
       JAVA_OPTS: >-
@@ -86,7 +86,7 @@ services:
     links:
       - activemq
   shared-file-store:
-    image: quay.io/alfresco/alfresco-shared-file-store:4.1.1
+    image: quay.io/alfresco/alfresco-shared-file-store:4.1.2
     mem_limit: 512m
     environment:
       JAVA_OPTS: >-
@@ -99,7 +99,7 @@ services:
     volumes:
       - shared-file-store-volume:/tmp/Alfresco/sfs
   share:
-    image: quay.io/alfresco/alfresco-share:7.4.1.6
+    image: quay.io/alfresco/alfresco-share:7.4.2
     mem_limit: 1g
     environment:
       REPO_HOST: "alfresco"

diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml
@@ -48,7 +48,7 @@ services:
         -XX:MinRAMPercentage=50
         -XX:MaxRAMPercentage=80
   transform-core-aio:
-    image: alfresco/alfresco-transform-core-aio:5.1.1
+    image: alfresco/alfresco-transform-core-aio:5.1.2
     mem_limit: 1536m
     environment:
       JAVA_OPTS: >-

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -66,7 +66,7 @@ services:
       start_period: 1m
   transform-router:
     mem_limit: 512m
-    image: quay.io/alfresco/alfresco-transform-router:4.1.1
+    image: quay.io/alfresco/alfresco-transform-router:4.1.2
     environment:
       JAVA_OPTS: >-
         -XX:MinRAMPercentage=50
@@ -80,7 +80,7 @@ services:
     depends_on:
       - activemq
   transform-core-aio:
-    image: alfresco/alfresco-transform-core-aio:5.1.1
+    image: alfresco/alfresco-transform-core-aio:5.1.2
     mem_limit: 1536m
     environment:
       JAVA_OPTS: >-
@@ -94,7 +94,7 @@ services:
     depends_on:
       - activemq
   shared-file-store:
-    image: quay.io/alfresco/alfresco-shared-file-store:4.1.1
+    image: quay.io/alfresco/alfresco-shared-file-store:4.1.2
     mem_limit: 512m
     environment:
       JAVA_OPTS: >-