Skip to content

Commit

Permalink
OPSEXP-2694: automatic updates of acs sso example chart (#1243)
Browse files Browse the repository at this point in the history
Co-authored-by: alxgomz <[email protected]>
  • Loading branch information
alxgomz and alxgomz authored Nov 7, 2024
1 parent 3a47e52 commit 56609ec
Show file tree
Hide file tree
Showing 24 changed files with 483 additions and 248 deletions.
15 changes: 7 additions & 8 deletions .github/workflows/bumpVersions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,15 @@ jobs:
ref: ${{ inputs.alfresco-updatecli-ref || env.DEFAULT_BRANCH_NAME }}
path: alfresco-updatecli

- name: Preprocess values file appending existing keys only
- name: Build manifest and run Updatecli pipelines
shell: bash
run: |
yq '. *? load("alfresco-updatecli/deployments/values/supported-matrix.yaml") |
explode(.)' updatecli-matrix-targets.yaml |
tee ./merged.yaml
- name: updatecli apply
# path to values file must be relative https://github.com/updatecli/updatecli/issues/1253
run: updatecli apply -c alfresco-updatecli/deployments/uber-manifest.tpl -v ./merged.yaml
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
updatecli apply -c alfresco-updatecli/deployments/uber-manifest.tpl -v ./${TARGET}_merged.yaml
done
env:
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
QUAY_PASSWORD: ${{ secrets.QUAY_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ hs_err_pid*

# updatecli workflow
alfresco-updatecli
merged.yaml
*_merged.yaml

_site
14 changes: 7 additions & 7 deletions docker-compose/7.1.N-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
# Java processes requires setting -XX:MaxRAM= due to cgroupv2 changes in recent Linux kernels
# https://hub.alfresco.com/t5/alfresco-content-services-blog/acs-containers-and-cgroup-v2-in-acs-up-to-7-2/ba-p/318039
#
#
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:7.1.1.10
Expand Down Expand Up @@ -194,15 +194,15 @@ services:
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
- SOLR_ALFRESCO_HOST=alfresco
- SOLR_ALFRESCO_PORT=8080
SOLR_ALFRESCO_HOST: alfresco
SOLR_ALFRESCO_PORT: 8080
# Alfresco needs to know how to call solr
- SOLR_SOLR_HOST=solr6
- SOLR_SOLR_PORT=8983
SOLR_SOLR_HOST: solr6
SOLR_SOLR_PORT: 8983
# Create the default alfresco and archive cores
- SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive
# HTTP by default
- ALFRESCO_SECURE_COMMS=none
ALFRESCO_SECURE_COMMS: none
ports:
- "8083:8983" # Browser port
activemq:
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/7.3.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.3.2.1
image: quay.io/alfresco/alfresco-content-repository:7.3.2.3
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.3.2.1
image: quay.io/alfresco/alfresco-share:7.3.2.3
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
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.1
image: quay.io/alfresco/alfresco-content-repository:7.4.2.3
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.1
image: quay.io/alfresco/alfresco-share:7.4.2.3
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
Expand Down
14 changes: 7 additions & 7 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-M1
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-A1
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-A1
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-A1
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-M1
image: quay.io/alfresco/alfresco-share:23.4.0-A15
mem_limit: 1g
environment:
CSRF_FILTER_ORIGIN: http://localhost:8080
Expand Down Expand Up @@ -204,7 +204,7 @@ services:
retries: 5
start_period: 30s
search:
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.1.0
image: quay.io/alfresco/alfresco-elasticsearch-live-indexing:4.2.0-A4
mem_limit: 1g
environment:
ALFRESCO_ACCEPTED_CONTENT_MEDIA_TYPES_CACHE_BASE_URL: >-
Expand All @@ -227,7 +227,7 @@ services:
shared-file-store:
condition: service_healthy
search-reindexing:
image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.1.0
image: quay.io/alfresco/alfresco-elasticsearch-reindexing:4.2.0-A4
mem_limit: 1g
restart: on-failure:5
environment:
Expand Down
Loading

0 comments on commit 56609ec

Please sign in to comment.