From 7dbf813f94ec5599d733aa110509e5262080e30f Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 7 Sep 2023 11:23:37 +0200 Subject: [PATCH 1/4] Enable appVersion bump from uber manifest --- .github/workflows/bumpVersions.yml | 2 +- updatecli-matrix-targets.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 3049e1755..99aff9f84 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 with: repository: alfresco/alfresco-updatecli - ref: master + ref: OPSEXP-1908-appVersion path: alfresco-updatecli - name: Preprocess values file appending existing keys only diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml index 29fbd8e47..6ed2af116 100644 --- a/updatecli-matrix-targets.yaml +++ b/updatecli-matrix-targets.yaml @@ -14,6 +14,7 @@ matrix: helm_target: &helmvalues231 >- helm/alfresco-content-services/values.yaml helm_key: $.repository.image.tag + helm_update_appVersion: true share: version: pattern: From 7ba4573abbb56599e89df15bba8307a6dcf7487e Mon Sep 17 00:00:00 2001 From: gionn Date: Thu, 7 Sep 2023 10:31:38 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9B=A0=20Updatecli=20pipeline=20acs?= =?UTF-8?q?=20bump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose/7.0.N-docker-compose.yml | 2 +- docker-compose/7.1.N-docker-compose.yml | 2 +- docker-compose/7.4.N-docker-compose.yml | 2 +- docker-compose/community-docker-compose.yml | 2 +- docker-compose/docker-compose.yml | 14 ++++---- .../elasticsearch-override-docker-compose.yml | 4 +-- .../7.4.N_values.yaml | 2 +- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 36 +++++++++---------- .../community_values.yaml | 2 +- helm/alfresco-content-services/values.yaml | 34 +++++++++--------- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml index e1286464a..60d1ff7c9 100644 --- a/docker-compose/7.0.N-docker-compose.yml +++ b/docker-compose/7.0.N-docker-compose.yml @@ -145,7 +145,7 @@ services: - "61616:61616" # OpenWire - "61613:61613" # STOMP digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.6.2 + image: quay.io/alfresco/alfresco-digital-workspace:2.6.1 mem_limit: 128m environment: APP_CONFIG_AUTH_TYPE: "BASIC" diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml index 0d55a3bf1..48719534a 100644 --- a/docker-compose/7.1.N-docker-compose.yml +++ b/docker-compose/7.1.N-docker-compose.yml @@ -145,7 +145,7 @@ services: - "61616:61616" # OpenWire - "61613:61613" # STOMP digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.6.2 + image: quay.io/alfresco/alfresco-digital-workspace:2.6.1 mem_limit: 128m environment: APP_CONFIG_AUTH_TYPE: "BASIC" diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml index 067cb0328..ce460104c 100644 --- a/docker-compose/7.4.N-docker-compose.yml +++ b/docker-compose/7.4.N-docker-compose.yml @@ -122,7 +122,7 @@ services: ports: - "5432:5432" solr6: - image: quay.io/alfresco/search-services:2.0.8 + image: quay.io/alfresco/search-services:2.0.8.1 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml index e131954d4..494889ff4 100644 --- a/docker-compose/community-docker-compose.yml +++ b/docker-compose/community-docker-compose.yml @@ -80,7 +80,7 @@ services: ports: - "5432:5432" solr6: - image: docker.io/alfresco/alfresco-search-services:2.0.8 + image: docker.io/alfresco/alfresco-search-services:2.0.8.1 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 8ed0af8fe..ae31a2ba8 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -18,7 +18,7 @@ version: "2" services: alfresco: - image: quay.io/alfresco/alfresco-content-repository:23.1.0-A27 + image: quay.io/alfresco/alfresco-content-repository:23.1.0-A35 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:3.0.1-A3 + image: quay.io/alfresco/alfresco-transform-router:3.1.0-A1 environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -72,7 +72,7 @@ services: links: - activemq transform-core-aio: - image: alfresco/alfresco-transform-core-aio:4.0.1-A3 + image: alfresco/alfresco-transform-core-aio:4.1.0-A1 mem_limit: 1536m environment: JAVA_OPTS: >- @@ -86,7 +86,7 @@ services: links: - activemq shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:3.0.1-A3 + image: quay.io/alfresco/alfresco-shared-file-store:3.1.0-A1 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:23.1.0-A27 + image: quay.io/alfresco/alfresco-share:23.1.0-A35 mem_limit: 1g environment: REPO_HOST: "alfresco" @@ -122,7 +122,7 @@ services: ports: - "5432:5432" solr6: - image: quay.io/alfresco/search-services:2.0.8 + image: quay.io/alfresco/search-services:2.1.0-A1 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco @@ -178,7 +178,7 @@ services: - share - control-center sync-service: - image: quay.io/alfresco/service-sync:4.0.0-M10 + image: quay.io/alfresco/service-sync:4.0.0-A16 mem_limit: 1g environment: JAVA_OPTS: >- diff --git a/docker-compose/elasticsearch-override-docker-compose.yml b/docker-compose/elasticsearch-override-docker-compose.yml index 536067419..dab98f102 100644 --- a/docker-compose/elasticsearch-override-docker-compose.yml +++ b/docker-compose/elasticsearch-override-docker-compose.yml @@ -44,7 +44,7 @@ services: - 9200:9200 - 9300:9300 search: - image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:3.4.0-M1 + image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:3.4.0-A3 depends_on: - elasticsearch - alfresco @@ -56,7 +56,7 @@ services: SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 search-reindexing: - image: quay.io/alfresco/alfresco-elasticsearch-reindexing:3.4.0-M1 + image: quay.io/alfresco/alfresco-elasticsearch-reindexing:3.4.0-A3 depends_on: - alfresco restart: on-failure:10 diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml index 6397c076c..b084b4cde 100644 --- a/helm/alfresco-content-services/7.4.N_values.yaml +++ b/helm/alfresco-content-services/7.4.N_values.yaml @@ -36,7 +36,7 @@ activemq: tag: null alfresco-search: searchServicesImage: - tag: 2.0.8 + tag: 2.0.8.1 alfresco-search-enterprise: enabled: false liveIndexing: diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 5fb986482..64033efa8 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -5,7 +5,7 @@ apiVersion: v2 name: alfresco-content-services version: 7.0.0-M.1 -appVersion: 23.1.0-A27 +appVersion: 23.1.0-A35 description: A Helm chart for deploying Alfresco Content Services keywords: - content diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 8dc18be7e..4ad6b65ab 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -1,6 +1,6 @@ # alfresco-content-services -![Version: 7.0.0-M.1](https://img.shields.io/badge/Version-7.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.1.0-A27](https://img.shields.io/badge/AppVersion-23.1.0--A27-informational?style=flat-square) +![Version: 7.0.0-M.1](https://img.shields.io/badge/Version-7.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.1.0-A35](https://img.shields.io/badge/AppVersion-23.1.0--A35-informational?style=flat-square) A Helm chart for deploying Alfresco Content Services @@ -43,7 +43,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | 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` | | | alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | -| alfresco-ai-transformer.image.tag | string | `"2.0.1-A4"` | | +| alfresco-ai-transformer.image.tag | string | `"2.1.0-A1"` | | | alfresco-ai-transformer.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-connector-ms365.enabled | bool | `false` | Enable/Disable Alfresco Content Connector for Microsoft 365 | | alfresco-connector-ms365.image.repository | string | `"quay.io/alfresco/alfresco-ooi-service"` | | @@ -100,13 +100,13 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-digital-workspace.service.envType | string | `"frontend"` | | | alfresco-search-enterprise.elasticsearch.enabled | bool | `true` | Enables the embedded elasticsearch cluster | | alfresco-search-enterprise.enabled | bool | `false` | | -| alfresco-search-enterprise.liveIndexing.content.image.tag | string | `"3.4.0-M1"` | | -| alfresco-search-enterprise.liveIndexing.mediation.image.tag | string | `"3.4.0-M1"` | | -| alfresco-search-enterprise.liveIndexing.metadata.image.tag | string | `"3.4.0-M1"` | | -| alfresco-search-enterprise.liveIndexing.path.image.tag | string | `"3.4.0-M1"` | | +| alfresco-search-enterprise.liveIndexing.content.image.tag | string | `"3.4.0-A3"` | | +| alfresco-search-enterprise.liveIndexing.mediation.image.tag | string | `"3.4.0-A3"` | | +| alfresco-search-enterprise.liveIndexing.metadata.image.tag | string | `"3.4.0-A3"` | | +| alfresco-search-enterprise.liveIndexing.path.image.tag | string | `"3.4.0-A3"` | | | alfresco-search-enterprise.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-search-enterprise.reindexing.enabled | bool | `true` | | -| alfresco-search-enterprise.reindexing.image.tag | string | `"3.4.0-M1"` | | +| alfresco-search-enterprise.reindexing.image.tag | string | `"3.4.0-A3"` | | | alfresco-search-enterprise.reindexing.postgresql.database | string | `"alfresco"` | | | alfresco-search-enterprise.reindexing.postgresql.existingSecretName | string | `"acs-alfresco-cs-dbsecret"` | | | alfresco-search-enterprise.reindexing.postgresql.hostname | string | `"postgresql-acs"` | | @@ -120,9 +120,9 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-search.ingress.tls | list | `[]` | | | alfresco-search.nameOverride | string | `"alfresco-search"` | | | alfresco-search.searchServicesImage.repository | string | `"quay.io/alfresco/search-services"` | | -| alfresco-search.searchServicesImage.tag | string | `"2.0.8"` | | +| alfresco-search.searchServicesImage.tag | string | `"2.1.0-A1"` | | | alfresco-sync-service.enabled | bool | `true` | Toggle deployment of Alfresco Sync Service (Desktop-Sync) Check [Alfresco Sync Service Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) | -| alfresco-sync-service.image.tag | string | `"4.0.0-M10"` | | +| alfresco-sync-service.image.tag | string | `"4.0.0-A16"` | | | alfresco-sync-service.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-sync-service.postgresql.auth.database | string | `"syncservice-postgresql"` | | | alfresco-sync-service.postgresql.auth.enablePostgresUser | bool | `false` | | @@ -139,30 +139,30 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-transform-service.enabled | bool | `true` | | | alfresco-transform-service.filestore.enabled | bool | `true` | Declares the alfresco-shared-file-store used by the content repository and transform service | | alfresco-transform-service.filestore.image.repository | string | `"quay.io/alfresco/alfresco-shared-file-store"` | | -| alfresco-transform-service.filestore.image.tag | string | `"3.0.1-A3"` | | +| alfresco-transform-service.filestore.image.tag | string | `"3.1.0-A1"` | | | alfresco-transform-service.filestore.persistence.data.mountPath | string | `"/tmp/Alfresco"` | | | alfresco-transform-service.filestore.persistence.data.subPath | string | `"alfresco-content-services/filestore-data"` | | | alfresco-transform-service.filestore.persistence.enabled | bool | `true` | Persist filestore data | | alfresco-transform-service.filestore.replicaCount | int | `1` | | | alfresco-transform-service.imagemagick.enabled | bool | `true` | Declares the alfresco-imagemagick service used by the content repository to transform image files | | alfresco-transform-service.imagemagick.image.repository | string | `"alfresco/alfresco-imagemagick"` | | -| alfresco-transform-service.imagemagick.image.tag | string | `"4.0.1-A3"` | | +| alfresco-transform-service.imagemagick.image.tag | string | `"4.1.0-A1"` | | | alfresco-transform-service.libreoffice.enabled | bool | `true` | Declares the alfresco-libreoffice service used by the content repository to transform office files | | alfresco-transform-service.libreoffice.image.repository | string | `"alfresco/alfresco-libreoffice"` | | -| alfresco-transform-service.libreoffice.image.tag | string | `"4.0.1-A3"` | | +| alfresco-transform-service.libreoffice.image.tag | string | `"4.1.0-A1"` | | | alfresco-transform-service.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-transform-service.pdfrenderer.enabled | bool | `true` | Declares the alfresco-pdf-renderer service used by the content repository to transform pdf files | | alfresco-transform-service.pdfrenderer.image.repository | string | `"alfresco/alfresco-pdf-renderer"` | | -| alfresco-transform-service.pdfrenderer.image.tag | string | `"4.0.1-A3"` | | +| alfresco-transform-service.pdfrenderer.image.tag | string | `"4.1.0-A1"` | | | alfresco-transform-service.tika.enabled | bool | `true` | Declares the alfresco-tika service used by the content repository to transform office files | | alfresco-transform-service.tika.image.repository | string | `"alfresco/alfresco-tika"` | | -| alfresco-transform-service.tika.image.tag | string | `"4.0.1-A3"` | | +| alfresco-transform-service.tika.image.tag | string | `"4.1.0-A1"` | | | alfresco-transform-service.transformmisc.enabled | bool | `true` | Declares the alfresco-tika service used by the content repository to transform office files | | alfresco-transform-service.transformmisc.image.repository | string | `"alfresco/alfresco-transform-misc"` | | -| alfresco-transform-service.transformmisc.image.tag | string | `"4.0.1-A3"` | | +| alfresco-transform-service.transformmisc.image.tag | string | `"4.1.0-A1"` | | | alfresco-transform-service.transformrouter.enabled | bool | `true` | Declares the alfresco-transform-router service used by the content repository to route transformation requests | | alfresco-transform-service.transformrouter.image.repository | string | `"quay.io/alfresco/alfresco-transform-router"` | | -| alfresco-transform-service.transformrouter.image.tag | string | `"3.0.1-A3"` | | +| alfresco-transform-service.transformrouter.image.tag | string | `"3.1.0-A1"` | | | alfresco-transform-service.transformrouter.replicaCount | int | `2` | | | apiexplorer | object | `{"ingress":{"path":"/api-explorer"}}` | Declares the api-explorer service used by the content repository | | database.driver | string | `nil` | Postgresql jdbc driver name ex: org.postgresql.Driver. It should be available in the container image. | @@ -228,7 +228,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | repository.image.internalPort | int | `8080` | | | repository.image.pullPolicy | string | `"IfNotPresent"` | | | repository.image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` | | -| repository.image.tag | string | `"23.1.0-A27"` | | +| repository.image.tag | string | `"23.1.0-A35"` | | | repository.ingress.annotations | object | `{}` | | | repository.ingress.maxUploadSize | string | `"5g"` | | | repository.ingress.path | string | `"/"` | | @@ -278,7 +278,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | s3connector.secrets.secretKey | string | `nil` | | | share.enabled | bool | `true` | toggle deploying Alfresco Share UI | | share.image.repository | string | `"quay.io/alfresco/alfresco-share"` | | -| share.image.tag | string | `"23.1.0-A27"` | | +| share.image.tag | string | `"23.1.0-A35"` | | | share.nameOverride | string | `"share"` | | | share.repository.existingConfigMap.keys.host | string | `"repo_svc_name"` | Name of the key in the configmap which points to the repository service hostname | | share.repository.existingConfigMap.keys.port | string | `"repo_svc_port"` | Name of the key in the configmap which points to the repository service port | diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index 47efa221f..f3a4ee04c 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -16,7 +16,7 @@ share: alfresco-search: searchServicesImage: repository: alfresco/alfresco-search-services - tag: 2.0.8 + tag: 2.0.8.1 email: server: enabled: false diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 6b37ea7cd..8b64d9c8e 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -29,7 +29,7 @@ repository: type: Recreate image: repository: quay.io/alfresco/alfresco-content-repository - tag: 23.1.0-A27 + tag: 23.1.0-A35 pullPolicy: IfNotPresent internalPort: 8080 hazelcastPort: 5701 @@ -179,42 +179,42 @@ alfresco-transform-service: replicaCount: 2 image: repository: quay.io/alfresco/alfresco-transform-router - tag: 3.0.1-A3 + tag: 3.1.0-A1 pdfrenderer: # -- Declares the alfresco-pdf-renderer service used by the content repository # to transform pdf files enabled: true image: repository: alfresco/alfresco-pdf-renderer - tag: 4.0.1-A3 + tag: 4.1.0-A1 imagemagick: # -- Declares the alfresco-imagemagick service used by the content repository # to transform image files enabled: true image: repository: alfresco/alfresco-imagemagick - tag: 4.0.1-A3 + tag: 4.1.0-A1 libreoffice: # -- Declares the alfresco-libreoffice service used by the content repository # to transform office files enabled: true image: repository: alfresco/alfresco-libreoffice - tag: 4.0.1-A3 + tag: 4.1.0-A1 tika: # -- Declares the alfresco-tika service used by the content repository # to transform office files enabled: true image: repository: alfresco/alfresco-tika - tag: 4.0.1-A3 + tag: 4.1.0-A1 transformmisc: # -- Declares the alfresco-tika service used by the content repository # to transform office files enabled: true image: repository: alfresco/alfresco-transform-misc - tag: 4.0.1-A3 + tag: 4.1.0-A1 filestore: # -- Declares the alfresco-shared-file-store used by the content repository # and transform service @@ -222,7 +222,7 @@ alfresco-transform-service: replicaCount: 1 image: repository: quay.io/alfresco/alfresco-shared-file-store - tag: 3.0.1-A3 + tag: 3.1.0-A1 persistence: # -- Persist filestore data enabled: true @@ -234,7 +234,7 @@ share: enabled: true image: repository: quay.io/alfresco/alfresco-share - tag: 23.1.0-A27 + tag: 23.1.0-A35 nameOverride: share repository: existingConfigMap: @@ -251,7 +251,7 @@ alfresco-search: enabled: true searchServicesImage: repository: quay.io/alfresco/search-services - tag: 2.0.8 + tag: 2.1.0-A1 nameOverride: alfresco-search # If an external Solr service is to be used then enabled must be set to false # and external has to be configured accordingly. @@ -300,16 +300,16 @@ alfresco-search-enterprise: liveIndexing: mediation: image: - tag: 3.4.0-M1 + tag: 3.4.0-A3 content: image: - tag: 3.4.0-M1 + tag: 3.4.0-A3 metadata: image: - tag: 3.4.0-M1 + tag: 3.4.0-A3 path: image: - tag: 3.4.0-M1 + tag: 3.4.0-A3 reindexing: enabled: true postgresql: @@ -318,7 +318,7 @@ alfresco-search-enterprise: database: alfresco existingSecretName: *acs_database_secretName image: - tag: 3.4.0-M1 + tag: 3.4.0-A3 alfresco-digital-workspace: nodeSelector: {} enabled: true @@ -549,7 +549,7 @@ alfresco-sync-service: # Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) enabled: true image: - tag: 4.0.0-M10 + tag: 4.0.0-A16 postgresql: enabled: true image: @@ -579,7 +579,7 @@ alfresco-ai-transformer: existingSecretName: *acs_messageBroker_secretName image: repository: quay.io/alfresco/alfresco-ai-docker-engine - tag: 2.0.1-A4 + tag: 2.1.0-A1 # aws: # accessKey: # secretAccessKey: From efc46eb101f75b8c5c9b0e9516c740eff59bccb0 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 7 Sep 2023 12:38:23 +0200 Subject: [PATCH 3/4] =?UTF-8?q?evert=20"=F0=9F=9B=A0=20Updatecli=20pipelin?= =?UTF-8?q?e=20acs=20bump"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7ba4573abbb56599e89df15bba8307a6dcf7487e. --- docker-compose/7.0.N-docker-compose.yml | 2 +- docker-compose/7.1.N-docker-compose.yml | 2 +- docker-compose/7.4.N-docker-compose.yml | 2 +- docker-compose/community-docker-compose.yml | 2 +- docker-compose/docker-compose.yml | 14 ++++---- .../elasticsearch-override-docker-compose.yml | 4 +-- .../7.4.N_values.yaml | 2 +- helm/alfresco-content-services/Chart.yaml | 2 +- helm/alfresco-content-services/README.md | 36 +++++++++---------- .../community_values.yaml | 2 +- helm/alfresco-content-services/values.yaml | 34 +++++++++--------- 11 files changed, 51 insertions(+), 51 deletions(-) diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml index 60d1ff7c9..e1286464a 100644 --- a/docker-compose/7.0.N-docker-compose.yml +++ b/docker-compose/7.0.N-docker-compose.yml @@ -145,7 +145,7 @@ services: - "61616:61616" # OpenWire - "61613:61613" # STOMP digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.6.1 + image: quay.io/alfresco/alfresco-digital-workspace:2.6.2 mem_limit: 128m environment: APP_CONFIG_AUTH_TYPE: "BASIC" diff --git a/docker-compose/7.1.N-docker-compose.yml b/docker-compose/7.1.N-docker-compose.yml index 48719534a..0d55a3bf1 100644 --- a/docker-compose/7.1.N-docker-compose.yml +++ b/docker-compose/7.1.N-docker-compose.yml @@ -145,7 +145,7 @@ services: - "61616:61616" # OpenWire - "61613:61613" # STOMP digital-workspace: - image: quay.io/alfresco/alfresco-digital-workspace:2.6.1 + image: quay.io/alfresco/alfresco-digital-workspace:2.6.2 mem_limit: 128m environment: APP_CONFIG_AUTH_TYPE: "BASIC" diff --git a/docker-compose/7.4.N-docker-compose.yml b/docker-compose/7.4.N-docker-compose.yml index ce460104c..067cb0328 100644 --- a/docker-compose/7.4.N-docker-compose.yml +++ b/docker-compose/7.4.N-docker-compose.yml @@ -122,7 +122,7 @@ services: ports: - "5432:5432" solr6: - image: quay.io/alfresco/search-services:2.0.8.1 + image: quay.io/alfresco/search-services:2.0.8 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco diff --git a/docker-compose/community-docker-compose.yml b/docker-compose/community-docker-compose.yml index 494889ff4..e131954d4 100644 --- a/docker-compose/community-docker-compose.yml +++ b/docker-compose/community-docker-compose.yml @@ -80,7 +80,7 @@ services: ports: - "5432:5432" solr6: - image: docker.io/alfresco/alfresco-search-services:2.0.8.1 + image: docker.io/alfresco/alfresco-search-services:2.0.8 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index ae31a2ba8..8ed0af8fe 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -18,7 +18,7 @@ version: "2" services: alfresco: - image: quay.io/alfresco/alfresco-content-repository:23.1.0-A35 + image: quay.io/alfresco/alfresco-content-repository:23.1.0-A27 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:3.1.0-A1 + image: quay.io/alfresco/alfresco-transform-router:3.0.1-A3 environment: JAVA_OPTS: >- -XX:MinRAMPercentage=50 @@ -72,7 +72,7 @@ services: links: - activemq transform-core-aio: - image: alfresco/alfresco-transform-core-aio:4.1.0-A1 + image: alfresco/alfresco-transform-core-aio:4.0.1-A3 mem_limit: 1536m environment: JAVA_OPTS: >- @@ -86,7 +86,7 @@ services: links: - activemq shared-file-store: - image: quay.io/alfresco/alfresco-shared-file-store:3.1.0-A1 + image: quay.io/alfresco/alfresco-shared-file-store:3.0.1-A3 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:23.1.0-A35 + image: quay.io/alfresco/alfresco-share:23.1.0-A27 mem_limit: 1g environment: REPO_HOST: "alfresco" @@ -122,7 +122,7 @@ services: ports: - "5432:5432" solr6: - image: quay.io/alfresco/search-services:2.1.0-A1 + image: quay.io/alfresco/search-services:2.0.8 mem_limit: 2g environment: # Solr needs to know how to register itself with Alfresco @@ -178,7 +178,7 @@ services: - share - control-center sync-service: - image: quay.io/alfresco/service-sync:4.0.0-A16 + image: quay.io/alfresco/service-sync:4.0.0-M10 mem_limit: 1g environment: JAVA_OPTS: >- diff --git a/docker-compose/elasticsearch-override-docker-compose.yml b/docker-compose/elasticsearch-override-docker-compose.yml index dab98f102..536067419 100644 --- a/docker-compose/elasticsearch-override-docker-compose.yml +++ b/docker-compose/elasticsearch-override-docker-compose.yml @@ -44,7 +44,7 @@ services: - 9200:9200 - 9300:9300 search: - image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:3.4.0-A3 + image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:3.4.0-M1 depends_on: - elasticsearch - alfresco @@ -56,7 +56,7 @@ services: SPRING_ACTIVEMQ_BROKERURL: nio://activemq:61616 SPRING_ELASTICSEARCH_REST_URIS: http://elasticsearch:9200 search-reindexing: - image: quay.io/alfresco/alfresco-elasticsearch-reindexing:3.4.0-A3 + image: quay.io/alfresco/alfresco-elasticsearch-reindexing:3.4.0-M1 depends_on: - alfresco restart: on-failure:10 diff --git a/helm/alfresco-content-services/7.4.N_values.yaml b/helm/alfresco-content-services/7.4.N_values.yaml index b084b4cde..6397c076c 100644 --- a/helm/alfresco-content-services/7.4.N_values.yaml +++ b/helm/alfresco-content-services/7.4.N_values.yaml @@ -36,7 +36,7 @@ activemq: tag: null alfresco-search: searchServicesImage: - tag: 2.0.8.1 + tag: 2.0.8 alfresco-search-enterprise: enabled: false liveIndexing: diff --git a/helm/alfresco-content-services/Chart.yaml b/helm/alfresco-content-services/Chart.yaml index 64033efa8..5fb986482 100644 --- a/helm/alfresco-content-services/Chart.yaml +++ b/helm/alfresco-content-services/Chart.yaml @@ -5,7 +5,7 @@ apiVersion: v2 name: alfresco-content-services version: 7.0.0-M.1 -appVersion: 23.1.0-A35 +appVersion: 23.1.0-A27 description: A Helm chart for deploying Alfresco Content Services keywords: - content diff --git a/helm/alfresco-content-services/README.md b/helm/alfresco-content-services/README.md index 4ad6b65ab..8dc18be7e 100644 --- a/helm/alfresco-content-services/README.md +++ b/helm/alfresco-content-services/README.md @@ -1,6 +1,6 @@ # alfresco-content-services -![Version: 7.0.0-M.1](https://img.shields.io/badge/Version-7.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.1.0-A35](https://img.shields.io/badge/AppVersion-23.1.0--A35-informational?style=flat-square) +![Version: 7.0.0-M.1](https://img.shields.io/badge/Version-7.0.0--M.1-informational?style=flat-square) ![AppVersion: 23.1.0-A27](https://img.shields.io/badge/AppVersion-23.1.0--A27-informational?style=flat-square) A Helm chart for deploying Alfresco Content Services @@ -43,7 +43,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | 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` | | | alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | | -| alfresco-ai-transformer.image.tag | string | `"2.1.0-A1"` | | +| alfresco-ai-transformer.image.tag | string | `"2.0.1-A4"` | | | alfresco-ai-transformer.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-connector-ms365.enabled | bool | `false` | Enable/Disable Alfresco Content Connector for Microsoft 365 | | alfresco-connector-ms365.image.repository | string | `"quay.io/alfresco/alfresco-ooi-service"` | | @@ -100,13 +100,13 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-digital-workspace.service.envType | string | `"frontend"` | | | alfresco-search-enterprise.elasticsearch.enabled | bool | `true` | Enables the embedded elasticsearch cluster | | alfresco-search-enterprise.enabled | bool | `false` | | -| alfresco-search-enterprise.liveIndexing.content.image.tag | string | `"3.4.0-A3"` | | -| alfresco-search-enterprise.liveIndexing.mediation.image.tag | string | `"3.4.0-A3"` | | -| alfresco-search-enterprise.liveIndexing.metadata.image.tag | string | `"3.4.0-A3"` | | -| alfresco-search-enterprise.liveIndexing.path.image.tag | string | `"3.4.0-A3"` | | +| alfresco-search-enterprise.liveIndexing.content.image.tag | string | `"3.4.0-M1"` | | +| alfresco-search-enterprise.liveIndexing.mediation.image.tag | string | `"3.4.0-M1"` | | +| alfresco-search-enterprise.liveIndexing.metadata.image.tag | string | `"3.4.0-M1"` | | +| alfresco-search-enterprise.liveIndexing.path.image.tag | string | `"3.4.0-M1"` | | | alfresco-search-enterprise.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-search-enterprise.reindexing.enabled | bool | `true` | | -| alfresco-search-enterprise.reindexing.image.tag | string | `"3.4.0-A3"` | | +| alfresco-search-enterprise.reindexing.image.tag | string | `"3.4.0-M1"` | | | alfresco-search-enterprise.reindexing.postgresql.database | string | `"alfresco"` | | | alfresco-search-enterprise.reindexing.postgresql.existingSecretName | string | `"acs-alfresco-cs-dbsecret"` | | | alfresco-search-enterprise.reindexing.postgresql.hostname | string | `"postgresql-acs"` | | @@ -120,9 +120,9 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-search.ingress.tls | list | `[]` | | | alfresco-search.nameOverride | string | `"alfresco-search"` | | | alfresco-search.searchServicesImage.repository | string | `"quay.io/alfresco/search-services"` | | -| alfresco-search.searchServicesImage.tag | string | `"2.1.0-A1"` | | +| alfresco-search.searchServicesImage.tag | string | `"2.0.8"` | | | alfresco-sync-service.enabled | bool | `true` | Toggle deployment of Alfresco Sync Service (Desktop-Sync) Check [Alfresco Sync Service Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) | -| alfresco-sync-service.image.tag | string | `"4.0.0-A16"` | | +| alfresco-sync-service.image.tag | string | `"4.0.0-M10"` | | | alfresco-sync-service.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-sync-service.postgresql.auth.database | string | `"syncservice-postgresql"` | | | alfresco-sync-service.postgresql.auth.enablePostgresUser | bool | `false` | | @@ -139,30 +139,30 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | alfresco-transform-service.enabled | bool | `true` | | | alfresco-transform-service.filestore.enabled | bool | `true` | Declares the alfresco-shared-file-store used by the content repository and transform service | | alfresco-transform-service.filestore.image.repository | string | `"quay.io/alfresco/alfresco-shared-file-store"` | | -| alfresco-transform-service.filestore.image.tag | string | `"3.1.0-A1"` | | +| alfresco-transform-service.filestore.image.tag | string | `"3.0.1-A3"` | | | alfresco-transform-service.filestore.persistence.data.mountPath | string | `"/tmp/Alfresco"` | | | alfresco-transform-service.filestore.persistence.data.subPath | string | `"alfresco-content-services/filestore-data"` | | | alfresco-transform-service.filestore.persistence.enabled | bool | `true` | Persist filestore data | | alfresco-transform-service.filestore.replicaCount | int | `1` | | | alfresco-transform-service.imagemagick.enabled | bool | `true` | Declares the alfresco-imagemagick service used by the content repository to transform image files | | alfresco-transform-service.imagemagick.image.repository | string | `"alfresco/alfresco-imagemagick"` | | -| alfresco-transform-service.imagemagick.image.tag | string | `"4.1.0-A1"` | | +| alfresco-transform-service.imagemagick.image.tag | string | `"4.0.1-A3"` | | | alfresco-transform-service.libreoffice.enabled | bool | `true` | Declares the alfresco-libreoffice service used by the content repository to transform office files | | alfresco-transform-service.libreoffice.image.repository | string | `"alfresco/alfresco-libreoffice"` | | -| alfresco-transform-service.libreoffice.image.tag | string | `"4.1.0-A1"` | | +| alfresco-transform-service.libreoffice.image.tag | string | `"4.0.1-A3"` | | | alfresco-transform-service.messageBroker.existingSecretName | string | `"acs-alfresco-cs-brokersecret"` | | | alfresco-transform-service.pdfrenderer.enabled | bool | `true` | Declares the alfresco-pdf-renderer service used by the content repository to transform pdf files | | alfresco-transform-service.pdfrenderer.image.repository | string | `"alfresco/alfresco-pdf-renderer"` | | -| alfresco-transform-service.pdfrenderer.image.tag | string | `"4.1.0-A1"` | | +| alfresco-transform-service.pdfrenderer.image.tag | string | `"4.0.1-A3"` | | | alfresco-transform-service.tika.enabled | bool | `true` | Declares the alfresco-tika service used by the content repository to transform office files | | alfresco-transform-service.tika.image.repository | string | `"alfresco/alfresco-tika"` | | -| alfresco-transform-service.tika.image.tag | string | `"4.1.0-A1"` | | +| alfresco-transform-service.tika.image.tag | string | `"4.0.1-A3"` | | | alfresco-transform-service.transformmisc.enabled | bool | `true` | Declares the alfresco-tika service used by the content repository to transform office files | | alfresco-transform-service.transformmisc.image.repository | string | `"alfresco/alfresco-transform-misc"` | | -| alfresco-transform-service.transformmisc.image.tag | string | `"4.1.0-A1"` | | +| alfresco-transform-service.transformmisc.image.tag | string | `"4.0.1-A3"` | | | alfresco-transform-service.transformrouter.enabled | bool | `true` | Declares the alfresco-transform-router service used by the content repository to route transformation requests | | alfresco-transform-service.transformrouter.image.repository | string | `"quay.io/alfresco/alfresco-transform-router"` | | -| alfresco-transform-service.transformrouter.image.tag | string | `"3.1.0-A1"` | | +| alfresco-transform-service.transformrouter.image.tag | string | `"3.0.1-A3"` | | | alfresco-transform-service.transformrouter.replicaCount | int | `2` | | | apiexplorer | object | `{"ingress":{"path":"/api-explorer"}}` | Declares the api-explorer service used by the content repository | | database.driver | string | `nil` | Postgresql jdbc driver name ex: org.postgresql.Driver. It should be available in the container image. | @@ -228,7 +228,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | repository.image.internalPort | int | `8080` | | | repository.image.pullPolicy | string | `"IfNotPresent"` | | | repository.image.repository | string | `"quay.io/alfresco/alfresco-content-repository"` | | -| repository.image.tag | string | `"23.1.0-A35"` | | +| repository.image.tag | string | `"23.1.0-A27"` | | | repository.ingress.annotations | object | `{}` | | | repository.ingress.maxUploadSize | string | `"5g"` | | | repository.ingress.path | string | `"/"` | | @@ -278,7 +278,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b | s3connector.secrets.secretKey | string | `nil` | | | share.enabled | bool | `true` | toggle deploying Alfresco Share UI | | share.image.repository | string | `"quay.io/alfresco/alfresco-share"` | | -| share.image.tag | string | `"23.1.0-A35"` | | +| share.image.tag | string | `"23.1.0-A27"` | | | share.nameOverride | string | `"share"` | | | share.repository.existingConfigMap.keys.host | string | `"repo_svc_name"` | Name of the key in the configmap which points to the repository service hostname | | share.repository.existingConfigMap.keys.port | string | `"repo_svc_port"` | Name of the key in the configmap which points to the repository service port | diff --git a/helm/alfresco-content-services/community_values.yaml b/helm/alfresco-content-services/community_values.yaml index f3a4ee04c..47efa221f 100644 --- a/helm/alfresco-content-services/community_values.yaml +++ b/helm/alfresco-content-services/community_values.yaml @@ -16,7 +16,7 @@ share: alfresco-search: searchServicesImage: repository: alfresco/alfresco-search-services - tag: 2.0.8.1 + tag: 2.0.8 email: server: enabled: false diff --git a/helm/alfresco-content-services/values.yaml b/helm/alfresco-content-services/values.yaml index 8b64d9c8e..6b37ea7cd 100644 --- a/helm/alfresco-content-services/values.yaml +++ b/helm/alfresco-content-services/values.yaml @@ -29,7 +29,7 @@ repository: type: Recreate image: repository: quay.io/alfresco/alfresco-content-repository - tag: 23.1.0-A35 + tag: 23.1.0-A27 pullPolicy: IfNotPresent internalPort: 8080 hazelcastPort: 5701 @@ -179,42 +179,42 @@ alfresco-transform-service: replicaCount: 2 image: repository: quay.io/alfresco/alfresco-transform-router - tag: 3.1.0-A1 + tag: 3.0.1-A3 pdfrenderer: # -- Declares the alfresco-pdf-renderer service used by the content repository # to transform pdf files enabled: true image: repository: alfresco/alfresco-pdf-renderer - tag: 4.1.0-A1 + tag: 4.0.1-A3 imagemagick: # -- Declares the alfresco-imagemagick service used by the content repository # to transform image files enabled: true image: repository: alfresco/alfresco-imagemagick - tag: 4.1.0-A1 + tag: 4.0.1-A3 libreoffice: # -- Declares the alfresco-libreoffice service used by the content repository # to transform office files enabled: true image: repository: alfresco/alfresco-libreoffice - tag: 4.1.0-A1 + tag: 4.0.1-A3 tika: # -- Declares the alfresco-tika service used by the content repository # to transform office files enabled: true image: repository: alfresco/alfresco-tika - tag: 4.1.0-A1 + tag: 4.0.1-A3 transformmisc: # -- Declares the alfresco-tika service used by the content repository # to transform office files enabled: true image: repository: alfresco/alfresco-transform-misc - tag: 4.1.0-A1 + tag: 4.0.1-A3 filestore: # -- Declares the alfresco-shared-file-store used by the content repository # and transform service @@ -222,7 +222,7 @@ alfresco-transform-service: replicaCount: 1 image: repository: quay.io/alfresco/alfresco-shared-file-store - tag: 3.1.0-A1 + tag: 3.0.1-A3 persistence: # -- Persist filestore data enabled: true @@ -234,7 +234,7 @@ share: enabled: true image: repository: quay.io/alfresco/alfresco-share - tag: 23.1.0-A35 + tag: 23.1.0-A27 nameOverride: share repository: existingConfigMap: @@ -251,7 +251,7 @@ alfresco-search: enabled: true searchServicesImage: repository: quay.io/alfresco/search-services - tag: 2.1.0-A1 + tag: 2.0.8 nameOverride: alfresco-search # If an external Solr service is to be used then enabled must be set to false # and external has to be configured accordingly. @@ -300,16 +300,16 @@ alfresco-search-enterprise: liveIndexing: mediation: image: - tag: 3.4.0-A3 + tag: 3.4.0-M1 content: image: - tag: 3.4.0-A3 + tag: 3.4.0-M1 metadata: image: - tag: 3.4.0-A3 + tag: 3.4.0-M1 path: image: - tag: 3.4.0-A3 + tag: 3.4.0-M1 reindexing: enabled: true postgresql: @@ -318,7 +318,7 @@ alfresco-search-enterprise: database: alfresco existingSecretName: *acs_database_secretName image: - tag: 3.4.0-A3 + tag: 3.4.0-M1 alfresco-digital-workspace: nodeSelector: {} enabled: true @@ -549,7 +549,7 @@ alfresco-sync-service: # Documentation](https://github.com/Alfresco/alfresco-helm-charts/tree/main/charts/alfresco-sync-service) enabled: true image: - tag: 4.0.0-A16 + tag: 4.0.0-M10 postgresql: enabled: true image: @@ -579,7 +579,7 @@ alfresco-ai-transformer: existingSecretName: *acs_messageBroker_secretName image: repository: quay.io/alfresco/alfresco-ai-docker-engine - tag: 2.1.0-A1 + tag: 2.0.1-A4 # aws: # accessKey: # secretAccessKey: From a5a42401016e132eeec28d7a5771d7e68e2cdd99 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Thu, 7 Sep 2023 17:38:34 +0200 Subject: [PATCH 4/4] prepare for merge --- .github/workflows/bumpVersions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bumpVersions.yml b/.github/workflows/bumpVersions.yml index 99aff9f84..3049e1755 100644 --- a/.github/workflows/bumpVersions.yml +++ b/.github/workflows/bumpVersions.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v3 with: repository: alfresco/alfresco-updatecli - ref: OPSEXP-1908-appVersion + ref: master path: alfresco-updatecli - name: Preprocess values file appending existing keys only