Skip to content

Commit

Permalink
OPSEXP-2988: bump image tags with updated updatecli matrix (#1269)
Browse files Browse the repository at this point in the history
Co-authored-by: alxgomz <[email protected]>
  • Loading branch information
alxgomz and alxgomz authored Dec 13, 2024
1 parent 35b7a5a commit 1fbcacf
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 133 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bumpVersions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
for i in {docker-compose,helm/*}/updatecli-matrix-targets.yaml; do
TARGET=$(basename $(dirname $i))
echo -e "\n###### Building UpdateCli manifest for ${TARGET}\n"
yq '. *? load("alfresco-updatecli/deployments/values/supported-matrix.yaml") | explode(.)' ${i} | tee ./${TARGET}_merged.yaml
yq 'explode(.) *? (load("alfresco-updatecli/deployments/values/supported-matrix.yaml")|explode(.))' ${i} | tee ./${TARGET}_merged.yaml
updatecli apply -c alfresco-updatecli/deployments/uber-manifest.tpl -v ./${TARGET}_merged.yaml
done
env:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/7.2.N-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ services:
- "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:2.1.2
image: quay.io/alfresco/alfresco-transform-router:4.1.5
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -99,7 +99,7 @@ services:
shared-file-store:
condition: service_healthy
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:3.1.2
image: alfresco/alfresco-transform-core-aio:5.1.5
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -123,7 +123,7 @@ services:
shared-file-store:
condition: service_healthy
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:2.1.2
image: quay.io/alfresco/alfresco-shared-file-store:4.1.5
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/7.3.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:2.1.2
image: quay.io/alfresco/alfresco-transform-router:4.1.5
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:3.1.2
image: alfresco/alfresco-transform-core-aio:5.1.5
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:2.1.2
image: quay.io/alfresco/alfresco-shared-file-store:4.1.5
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/7.4.N-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:7.4.2.3
image: quay.io/alfresco/alfresco-content-repository:7.4.2.4
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -136,7 +136,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:7.4.2.3
image: quay.io/alfresco/alfresco-share:7.4.2.4
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
Expand Down
10 changes: 5 additions & 5 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:25.1.0-A.1
image: quay.io/alfresco/alfresco-content-repository:25.1.0-A.3
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -134,7 +134,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:25.1.0-A.1
image: quay.io/alfresco/alfresco-share:25.1.0-A.3
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
Expand Down Expand Up @@ -276,7 +276,7 @@ services:
retries: 5
start_period: 5s
digital-workspace:
image: quay.io/alfresco/alfresco-digital-workspace:5.3.0-12081248559
image: quay.io/alfresco/alfresco-digital-workspace:5.3.0-12312682746
mem_limit: 128m
environment:
APP_CONFIG_PROVIDER: "ECM"
Expand Down Expand Up @@ -320,7 +320,7 @@ services:
elasticsearch:
condition: service_healthy
control-center:
image: quay.io/alfresco/alfresco-control-center:9.3.0-12081248559
image: quay.io/alfresco/alfresco-control-center:9.3.0-12312682746
mem_limit: 128m
environment:
APP_CONFIG_PROVIDER: "ECM"
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.2.0-A1
mem_limit: 1g
environment:
JAVA_OPTS: >-
Expand Down
2 changes: 2 additions & 0 deletions docker-compose/updatecli-matrix-targets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ matrix:
id: next
acs:
version:
versionFilterKind:
pattern:
image:
compose_target: &composeNext >-
Expand All @@ -18,6 +19,7 @@ matrix:
image:
share:
version:
versionFilterKind:
pattern:
image:
compose_target: *composeNext
Expand Down
18 changes: 9 additions & 9 deletions helm/alfresco-content-services/7.2.N_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,25 @@ alfresco-ai-transformer:
alfresco-transform-service:
transformrouter:
image:
tag: 2.1.2
tag: 4.1.5
pdfrenderer:
image:
tag: 3.1.2
tag: 5.1.5
imagemagick:
image:
tag: 3.1.2
tag: 5.1.5
libreoffice:
image:
tag: 3.1.2
tag: 5.1.5
tika:
image:
tag: 3.1.2
tag: 5.1.5
transformmisc:
image:
tag: 3.1.2
tag: 5.1.5
filestore:
image:
tag: 2.1.2
tag: 4.1.5
share:
image:
tag: 7.2.2.5
Expand Down Expand Up @@ -81,10 +81,10 @@ alfresco-sync-service:
tag: 3.11.3
alfresco-connector-ms365:
image:
tag: 1.1.3.2
tag: 2.0.4
alfresco-connector-msteams:
image:
tag: 1.1.0
tag: 2.0.4
elasticsearch-audit:
enabled: false
kibana-audit:
Expand Down
18 changes: 9 additions & 9 deletions helm/alfresco-content-services/7.3.N_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ share:
alfresco-transform-service:
transformrouter:
image:
tag: 2.1.2
tag: 4.1.5
pdfrenderer:
image:
tag: 3.1.2
tag: 5.1.5
imagemagick:
image:
tag: 3.1.2
tag: 5.1.5
libreoffice:
image:
tag: 3.1.2
tag: 5.1.5
tika:
image:
tag: 3.1.2
tag: 5.1.5
transformmisc:
image:
tag: 3.1.2
tag: 5.1.5
filestore:
image:
tag: 2.1.2
tag: 4.1.5
alfresco-search:
enabled: true
searchServicesImage:
Expand Down Expand Up @@ -81,10 +81,10 @@ alfresco-sync-service:
tag: 3.11.3
alfresco-connector-ms365:
image:
tag: 1.1.3.2
tag: 2.0.4
alfresco-connector-msteams:
image:
tag: 1.1.0
tag: 2.0.4
elasticsearch-audit:
enabled: false
kibana-audit:
Expand Down
4 changes: 2 additions & 2 deletions helm/alfresco-content-services/7.4.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.4.2.3
tag: 7.4.2.4
configuration:
search:
flavor: solr6
Expand Down Expand Up @@ -37,7 +37,7 @@ alfresco-ai-transformer:
tag: 3.1.7
share:
image:
tag: 7.4.2.3
tag: 7.4.2.4
alfresco-search:
enabled: true
searchServicesImage:
Expand Down
10 changes: 5 additions & 5 deletions helm/alfresco-content-services/pre-release_values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# the chart
alfresco-repository:
image:
tag: 25.1.0-A.1
tag: 25.1.0-A.3
activemq:
image:
repository: quay.io/alfresco/alfresco-activemq
Expand Down Expand Up @@ -34,7 +34,7 @@ alfresco-ai-transformer:
tag: 3.1.7
share:
image:
tag: 25.1.0-A.1
tag: 25.1.0-A.3
alfresco-search:
searchServicesImage:
tag: 2.1.0-A9
Expand All @@ -59,10 +59,10 @@ alfresco-search-enterprise:
tag: 4.3.0-A.1
alfresco-digital-workspace:
image:
tag: 5.3.0-12081248559
tag: 5.3.0-12312682746
alfresco-control-center:
image:
tag: 9.3.0-12081248559
tag: 9.3.0-12312682746
postgresql:
image:
tag: 14.4.0
Expand All @@ -71,7 +71,7 @@ postgresql-syncservice:
tag: 14.4.0
alfresco-sync-service:
image:
tag: 5.1.0-A9
tag: 5.2.0-A1
alfresco-connector-ms365:
image:
tag: 2.0.4-A4
Expand Down
Loading

0 comments on commit 1fbcacf

Please sign in to comment.