init

Alfresco · Feb 22, 2024 · 8c809eb · 8c809eb
1 parent be0cf8c
commit 8c809eb
Show file tree

Hide file tree

Showing 18 changed files with 96 additions and 8 deletions.
diff --git a/docker-compose/23.N-docker-compose.yml b/docker-compose/23.N-docker-compose.yml
@@ -177,7 +177,7 @@ services:
       alfresco:
         condition: service_healthy
   activemq:
-    image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml
@@ -145,7 +145,7 @@ services:
     ports:
       - "8083:8983" # Browser port
   activemq:
-    image: alfresco/alfresco-activemq:5.16-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.16.7-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml
@@ -145,7 +145,7 @@ services:
     ports:
       - "8083:8983" # Browser port
   activemq:
-    image: alfresco/alfresco-activemq:5.16-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.16.7-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/7.2.N-docker-compose.yml b/docker-compose/7.2.N-docker-compose.yml
@@ -149,7 +149,7 @@ services:
     ports:
       - "8083:8983" # Browser port
   activemq:
-    image: alfresco/alfresco-activemq:5.17-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.16.7-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/7.3.N-docker-compose.yml b/docker-compose/7.3.N-docker-compose.yml
@@ -141,7 +141,7 @@ services:
     ports:
       - "8083:8983" # Browser port
   activemq:
-    image: alfresco/alfresco-activemq:5.17-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml
@@ -141,7 +141,7 @@ services:
     ports:
       - "8083:8983" # Browser port
   activemq:
-    image: alfresco/alfresco-activemq:5.17-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.17.6-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml
@@ -99,7 +99,7 @@ services:
     ports:
       - "8083:8983" # Browser port
   activemq:
-    image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -179,7 +179,7 @@ services:
       alfresco:
         condition: service_healthy
   activemq:
-    image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
+    image: quay.io/alfresco/alfresco-activemq:5.18.3-jre17-rockylinux8
     mem_limit: 1g
     ports:
       - "8161:8161" # Web Console

diff --git a/helm/alfresco-content-services/23.N_values.yaml b/helm/alfresco-content-services/23.N_values.yaml
@@ -3,6 +3,9 @@
 alfresco-repository:
   image:
     tag: 23.1.1
+activemq:
+  image:
+    tag: 5.18.3-jre17-rockylinux8
 alfresco-transform-service:
   transformrouter:
     image:

diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml
@@ -6,6 +6,9 @@ alfresco-repository:
   configuration:
     search:
       flavor: solr6
+activemq:
+  image:
+    tag: 5.16.7-jre17-rockylinux8
 alfresco-search-enterprise:
   enabled: false
 elasticsearch:

diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml
@@ -6,6 +6,9 @@ alfresco-repository:
   configuration:
     search:
       flavor: solr6
+activemq:
+  image:
+    tag: 5.16.7-jre17-rockylinux8
 alfresco-ai-transformer:
   image:
     tag: 1.5.1

diff --git a/helm/alfresco-content-services/7.2.N_values.yaml b/helm/alfresco-content-services/7.2.N_values.yaml
@@ -6,6 +6,9 @@ alfresco-repository:
   configuration:
     search:
       flavor: solr6
+activemq:
+  image:
+    tag: 5.16.7-jre17-rockylinux8
 alfresco-ai-transformer:
   image:
     tag: 1.5.1

diff --git a/helm/alfresco-content-services/7.3.N_values.yaml b/helm/alfresco-content-services/7.3.N_values.yaml
@@ -6,6 +6,9 @@ alfresco-repository:
   configuration:
     search:
       flavor: solr6
+activemq:
+  image:
+    tag: 5.17.6-jre17-rockylinux8
 alfresco-ai-transformer:
   image:
     tag: 1.5.1

diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml
@@ -6,6 +6,9 @@ alfresco-repository:
   configuration:
     search:
       flavor: solr6
+activemq:
+  image:
+    tag: 5.17.6-jre17-rockylinux8
 alfresco-transform-service:
   transformrouter:
     image:

diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md
@@ -42,6 +42,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | activemq.adminUser.user | string | `"admin"` | Default username for the embedded broker admin user |
 | activemq.enabled | bool | `true` |  |
 | activemq.existingSecretName | string | `nil` |  |
+| activemq.image.tag | string | `"5.18.3-jre17-rockylinux8"` |  |
 | activemq.nameOverride | string | `"activemq"` |  |
 | activemq.nodeSelector | object | `{}` | Possibility to choose Node for pod, with a key-value pair label e.g {"kubernetes.io/hostname": multinode-demo-m02} |
 | alfresco-ai-transformer.enabled | bool | `false` | toggle deploying Alfresco ai transformer for more details about configuration check https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-ai-transformer |

diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml
@@ -11,6 +11,9 @@ alfresco-repository:
   configuration:
     search:
       flavor: solr6
+activemq:
+  image:
+    tag: 5.18.3-jre17-rockylinux8
 alfresco-search-enterprise:
   enabled: false
 elasticsearch:

diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml
@@ -155,6 +155,8 @@ alfresco-repository:
     accessModes:
       - ReadWriteMany
 activemq:
+  image:
+    tag: 5.18.3-jre17-rockylinux8
   nameOverride: activemq
   enabled: true
   # -- Possibility to choose Node for pod, with a key-value pair label

diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml
@@ -16,6 +16,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       # keep the unused anchor to detect multiple usages when copying blocks for new versions
       helm_update_appVersion: &helm_update_appVersion true
+    activemq:
+      version:
+      pattern:
+      image:
+      compose_target: *composeNext
+      compose_key: $.services.activemq.image
+      helm_target: *helmvaluesNext
+      helm_key: $.activemq.image.tag
     share:
       version:
       pattern:
@@ -134,6 +142,14 @@ matrix:
       helm_target: &helmvalues23n >-
         helm/alfresco-content-services/23.N_values.yaml
       helm_key: $.alfresco-repository.image.tag
+    activemq:
+      version:
+      pattern:
+      image:
+      compose_target: *compose23n
+      compose_key: $.services.activemq.image
+      helm_target: *helmvalues23n
+      helm_key: $.activemq.image.tag
     share:
       version:
       pattern:
@@ -252,6 +268,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       pattern:
       image:
+    activemq:
+      version:
+      compose_target: *compose74
+      compose_key: $.services.activemq.image
+      helm_target: *helmvalues74
+      helm_key: $.activemq.image.tag
+      pattern:
+      image:
     share:
       version:
       compose_target: *compose74
@@ -366,6 +390,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       pattern:
       image:
+    activemq:
+      version:
+      compose_target: *compose73
+      compose_key: $.services.activemq.image
+      helm_target: *helmvalues73
+      helm_key: $.activemq.image.tag
+      pattern:
+      image:
     share:
       version:
       compose_target: *compose73
@@ -480,6 +512,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       pattern:
       image:
+    activemq:
+      version:
+      compose_target: *compose72
+      compose_key: $.services.activemq.image
+      helm_target: *helmvalues72
+      helm_key: $.activemq.image.tag
+      pattern:
+      image:
     share:
       version:
       compose_target: *compose72
@@ -594,6 +634,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       pattern:
       image:
+    activemq:
+      version:
+      compose_target: *compose71
+      compose_key: $.services.activemq.image
+      helm_target: *helmvalues71
+      helm_key: $.activemq.image.tag
+      pattern:
+      image:
     share:
       version:
       compose_target: *compose71
@@ -701,6 +749,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       pattern:
       image:
+    activemq:
+      version:
+      compose_target: *compose70
+      compose_key: $.services.activemq.image
+      helm_target: *helmvalues70
+      helm_key: $.activemq.image.tag
+      pattern:
+      image:
     share:
       version:
       compose_target: *compose70
@@ -788,6 +844,14 @@ matrix:
       helm_key: $.alfresco-repository.image.tag
       pattern:
       image:
+    activemq:
+      version:
+      compose_target: *composeOss
+      compose_key: $.services.activemq.image
+      helm_target: *helmvaluesOss
+      helm_key: $.activemq.image.tag
+      pattern:
+      image:
     share:
       version:
       compose_target: *composeOss