Skip to content

Commit

Permalink
Revert "🛠 Updatecli pipeline values bump"
Browse files Browse the repository at this point in the history
This reverts commit 3fef1d0.
  • Loading branch information
alxgomz committed Nov 19, 2024
1 parent 3fef1d0 commit 9aca6dc
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 71 deletions.
4 changes: 2 additions & 2 deletions docker-compose/7.1.N-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:7.1.1.9
image: quay.io/alfresco/alfresco-content-repository:7.1.1.10
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -142,7 +142,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:7.1.1.9
image: quay.io/alfresco/alfresco-share:7.1.1.10
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/7.4.N-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ services:
- "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.1.5
image: quay.io/alfresco/alfresco-transform-router:4.1.4
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -94,7 +94,7 @@ services:
shared-file-store:
condition: service_healthy
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.5
image: alfresco/alfresco-transform-core-aio:5.1.4
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -117,7 +117,7 @@ services:
shared-file-store:
condition: service_healthy
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.1.5
image: quay.io/alfresco/alfresco-shared-file-store:4.1.4
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/community-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
- "traefik.http.middlewares.acsfakeauth.basicauth.users=fake:"
- "traefik.http.routers.solrapideny.middlewares=acsfakeauth@docker"
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.5
image: alfresco/alfresco-transform-core-aio:5.1.4
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand Down
8 changes: 4 additions & 4 deletions docker-compose/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ services:
- "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.1.5
image: quay.io/alfresco/alfresco-transform-router:4.1.4
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -92,7 +92,7 @@ services:
shared-file-store:
condition: service_healthy
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.5
image: alfresco/alfresco-transform-core-aio:5.1.4
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -115,7 +115,7 @@ services:
shared-file-store:
condition: service_healthy
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.1.5
image: quay.io/alfresco/alfresco-shared-file-store:4.1.4
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand Down Expand Up @@ -276,7 +276,7 @@ services:
retries: 5
start_period: 5s
audit-storage:
image: quay.io/alfresco/alfresco-audit-storage:1.0.0
image: quay.io/alfresco/alfresco-audit-storage:1.0.0-A1
mem_limit: 512m
environment:
SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000
Expand Down
22 changes: 11 additions & 11 deletions docker-compose/pre-release-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:23.4.0-A9
image: quay.io/alfresco/alfresco-content-repository:23.4.0-A15
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -69,7 +69,7 @@ services:
- "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.1.5
image: quay.io/alfresco/alfresco-transform-router:4.1.5-A3
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -92,7 +92,7 @@ services:
shared-file-store:
condition: service_healthy
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.5
image: alfresco/alfresco-transform-core-aio:5.1.5-A3
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -115,7 +115,7 @@ services:
shared-file-store:
condition: service_healthy
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.1.5
image: quay.io/alfresco/alfresco-shared-file-store:4.1.5-A3
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand All @@ -134,7 +134,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:23.4.0-A9
image: quay.io/alfresco/alfresco-share:23.4.0-A15
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
Expand Down Expand Up @@ -214,13 +214,13 @@ services:
elasticsearch:
condition: service_healthy
healthcheck:
test: ["CMD", "curl", "-f", "-o", "/dev/null", "http://localhost:5601/status"]
test: [ "CMD", "curl", "-f", "-o", "/dev/null", "http://localhost:5601/status" ]
interval: 10s
timeout: 2s
retries: 5
start_period: 30s
search:
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A5
mem_limit: 1g
environment:
ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >-
Expand All @@ -243,7 +243,7 @@ services:
shared-file-store:
condition: service_healthy
search-reindexing:
image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0
image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0-A5
mem_limit: 1g
restart: on-failure:5
environment:
Expand Down Expand Up @@ -300,7 +300,7 @@ services:
- "traefik.http.middlewares.adwchain.chain.middlewares=adwforceslash,adwroot"
- "traefik.http.routers.adw.middlewares=adwchain@docker"
audit-storage:
image: quay.io/alfresco/alfresco-audit-storage:1.0.0
image: quay.io/alfresco/alfresco-audit-storage:1.0.0-A1
mem_limit: 512m
environment:
SPRING_ACTIVEMQ_BROKERURL: failover:(nio://activemq:61616)?timeout=3000
Expand All @@ -309,7 +309,7 @@ services:
AUDIT_ENTRYSTORAGE_OPENSEARCH_CONNECTOR_PASSWORD: admin
AUDIT_EVENTINGESTION_URI: activemq:topic:alfresco.repo.event2
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8081/actuator/health/readiness"]
test: [ "CMD", "curl", "-f", "http://localhost:8081/actuator/health/readiness" ]
interval: 60s
timeout: 2s
retries: 3
Expand Down Expand Up @@ -366,7 +366,7 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro
sync-service:
image: quay.io/alfresco/service-sync:5.1.0-A9
image: quay.io/alfresco/service-sync:5.1.0-M2
mem_limit: 1g
environment:
JAVA_OPTS: >-
Expand Down
4 changes: 2 additions & 2 deletions helm/alfresco-content-services/7.1.N_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# the chart
alfresco-repository:
image:
tag: 7.1.1.9
tag: 7.1.1.10
configuration:
search:
flavor: solr6
Expand Down Expand Up @@ -37,7 +37,7 @@ alfresco-transform-service:
tag: 2.1.2
share:
image:
tag: 7.1.1.9
tag: 7.1.1.10
alfresco-search:
enabled: true
repository:
Expand Down
20 changes: 10 additions & 10 deletions helm/alfresco-content-services/7.4.N_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,28 @@ activemq:
alfresco-transform-service:
transformrouter:
image:
tag: 4.1.5
tag: 4.1.4
pdfrenderer:
image:
tag: 5.1.5
tag: 5.1.4
imagemagick:
image:
tag: 5.1.5
tag: 5.1.4
libreoffice:
image:
tag: 5.1.5
tag: 5.1.4
tika:
image:
tag: 5.1.5
tag: 5.1.4
transformmisc:
image:
tag: 5.1.5
tag: 5.1.4
filestore:
image:
tag: 4.1.5
tag: 4.1.4
alfresco-ai-transformer:
image:
tag: 3.1.7
tag: 3.1.6
share:
image:
tag: 7.4.2.3
Expand Down Expand Up @@ -81,10 +81,10 @@ alfresco-sync-service:
tag: 3.11.3
alfresco-connector-ms365:
image:
tag: 2.0.4
tag: 2.0.3
alfresco-connector-msteams:
image:
tag: 2.0.4
tag: 2.0.3
elasticsearch-audit:
enabled: false
kibana-audit:
Expand Down
22 changes: 11 additions & 11 deletions helm/alfresco-content-services/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
| 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 |
| alfresco-ai-transformer.fullnameOverride | string | `"alfresco-intelligence-service"` | Enforce static resource naming in AIS so the ATS trouter can be given the URL of the service |
| alfresco-ai-transformer.image.repository | string | `"quay.io/alfresco/alfresco-ai-docker-engine"` | |
| alfresco-ai-transformer.image.tag | string | `"3.1.7"` | |
| alfresco-ai-transformer.image.tag | string | `"3.1.6"` | |
| alfresco-ai-transformer.messageBroker.existingConfigMap.name | string | `"alfresco-infrastructure"` | Name of the configmap which holds the message broker URL |
| alfresco-ai-transformer.messageBroker.existingSecret.name | string | `"acs-alfresco-cs-brokersecret"` | Name of the configmap which holds the message broker credentials |
| alfresco-ai-transformer.sfs.existingConfigMap.keys.url | string | `"SFS_URL"` | Name of the key within the configmap which holds the sfs url |
| alfresco-ai-transformer.sfs.existingConfigMap.name | string | `"alfresco-infrastructure"` | Name of the configmap which holds the ATS shared filestore URL |
| alfresco-audit-storage.enabled | bool | `false` | |
| alfresco-audit-storage.image.repository | string | `"quay.io/alfresco/alfresco-audit-storage"` | |
| alfresco-audit-storage.image.tag | string | `"1.0.0"` | |
| alfresco-audit-storage.image.tag | string | `"1.0.0-A1"` | |
| alfresco-audit-storage.index.existingConfigMap.keys.url | string | `"AUDIT_ELASTICSEARCH_URL"` | |
| alfresco-audit-storage.index.existingConfigMap.name | string | `"alfresco-infrastructure"` | |
| alfresco-audit-storage.index.existingSecret.keys.password | string | `"AUDIT_ELASTICSEARCH_PASSWORD"` | |
Expand All @@ -73,13 +73,13 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
| alfresco-audit-storage.messageBroker.existingSecret.name | string | `"acs-alfresco-cs-brokersecret"` | Name of the configmap which holds the message broker credentials |
| 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"` | |
| alfresco-connector-ms365.image.tag | string | `"2.0.4"` | |
| alfresco-connector-ms365.image.tag | string | `"2.0.3"` | |
| alfresco-connector-ms365.repository.existingConfigMap.keys.host | string | `"repo_svc_name"` | Name of the key in the configmap which points to the repository service hostname |
| alfresco-connector-ms365.repository.existingConfigMap.keys.port | string | `"repo_svc_port"` | Name of the key in the configmap which points to the repository service port |
| alfresco-connector-ms365.repository.existingConfigMap.name | string | `"alfresco-infrastructure"` | Name of the configmap which hold the repository connection details |
| alfresco-connector-msteams.enabled | bool | `false` | Enable/Disable Alfresco Content Connector for Microsoft Teams |
| alfresco-connector-msteams.image.repository | string | `"quay.io/alfresco/alfresco-ms-teams-service"` | |
| alfresco-connector-msteams.image.tag | string | `"2.0.4"` | |
| alfresco-connector-msteams.image.tag | string | `"2.0.3"` | |
| alfresco-control-center.enabled | bool | `true` | |
| alfresco-control-center.env.APP_CONFIG_AUTH_TYPE | string | `"BASIC"` | |
| alfresco-control-center.env.APP_CONFIG_PROVIDER | string | `"ECM"` | |
Expand Down Expand Up @@ -175,33 +175,33 @@ 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 | `"4.1.5"` | |
| alfresco-transform-service.filestore.image.tag | string | `"4.1.4"` | |
| 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` | To have more than 1 replica persistence should support `ReadWriteMany` access mode |
| alfresco-transform-service.filestore.strategy.type | string | `"Recreate"` | Strategy must be set to Recreate when persistence supports only `ReadWriteOnce` access mode. If `ReadWriteMany` is supported, then it can be set to RollingUpdate. |
| 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 | `"5.1.5"` | |
| alfresco-transform-service.imagemagick.image.tag | string | `"5.1.4"` | |
| 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 | `"5.1.5"` | |
| alfresco-transform-service.libreoffice.image.tag | string | `"5.1.4"` | |
| alfresco-transform-service.messageBroker.existingConfigMap.name | string | `"alfresco-infrastructure"` | Name of the configmap which holds the ATS shared filestore URL |
| alfresco-transform-service.messageBroker.existingSecret.name | string | `"acs-alfresco-cs-brokersecret"` | |
| alfresco-transform-service.nameOverride | string | `"alfresco-transform-service"` | |
| 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 | `"5.1.5"` | |
| alfresco-transform-service.pdfrenderer.image.tag | string | `"5.1.4"` | |
| 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 | `"5.1.5"` | |
| alfresco-transform-service.tika.image.tag | string | `"5.1.4"` | |
| 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 | `"5.1.5"` | |
| alfresco-transform-service.transformmisc.image.tag | string | `"5.1.4"` | |
| 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 | `"4.1.5"` | |
| alfresco-transform-service.transformrouter.image.tag | string | `"4.1.4"` | |
| alfresco-transform-service.transformrouter.livenessProbe.path | string | `"/transform/config"` | Overrride liveness probe endpoint to work around https://alfresco.atlassian.net/browse/ACS-7269 |
| alfresco-transform-service.transformrouter.replicaCount | int | `2` | |
| config.repository.additionalGlobalProperties | object | `{}` | |
Expand Down
Loading

0 comments on commit 9aca6dc

Please sign in to comment.