Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPSEXP-2740: bump Alfresco components #1172

Merged
merged 9 commits into from
Jul 12, 2024
4 changes: 2 additions & 2 deletions docker-compose/7.2.N-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
version: "2"
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:7.2.2
image: quay.io/alfresco/alfresco-content-repository:7.2.2.1
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -106,7 +106,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:7.2.2
image: quay.io/alfresco/alfresco-share:7.2.2.1
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand Down
4 changes: 2 additions & 2 deletions docker-compose/7.3.N-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
version: "2"
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:7.3.2
image: quay.io/alfresco/alfresco-content-repository:7.3.2.1
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -99,7 +99,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:7.3.2
image: quay.io/alfresco/alfresco-share:7.3.2.1
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand Down
12 changes: 6 additions & 6 deletions docker-compose/7.4.N-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
version: "2"
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:7.4.2
image: quay.io/alfresco/alfresco-content-repository:7.4.2.1
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
-XX:MaxRAMPercentage=80
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.1.2
image: quay.io/alfresco/alfresco-transform-router:4.1.3
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -72,7 +72,7 @@ services:
links:
- activemq
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.2
image: alfresco/alfresco-transform-core-aio:5.1.3
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -86,7 +86,7 @@ services:
links:
- activemq
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.1.2
image: quay.io/alfresco/alfresco-shared-file-store:4.1.3
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand All @@ -99,7 +99,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:7.4.2
image: quay.io/alfresco/alfresco-share:7.4.2.1
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand All @@ -122,7 +122,7 @@ services:
ports:
- "5432:5432"
solr6:
image: quay.io/alfresco/search-services:2.0.10
image: quay.io/alfresco/search-services:2.0.11
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
Expand Down
6 changes: 3 additions & 3 deletions docker-compose/community-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ services:
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.2
image: alfresco/alfresco-transform-core-aio:5.1.3
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -57,7 +57,7 @@ services:
ports:
- "8090:8090"
share:
image: docker.io/alfresco/alfresco-share:23.2.1
image: docker.io/alfresco/alfresco-share:23.2.2
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand All @@ -80,7 +80,7 @@ services:
ports:
- "5432:5432"
solr6:
image: docker.io/alfresco/alfresco-search-services:2.0.10
image: docker.io/alfresco/alfresco-search-services:2.0.11
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
Expand Down
10 changes: 5 additions & 5 deletions docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
version: "2"
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:23.2.1
image: quay.io/alfresco/alfresco-content-repository:23.2.2
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
Expand Down Expand Up @@ -66,7 +66,7 @@ services:
start_period: 1m
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.1.2
image: quay.io/alfresco/alfresco-transform-router:4.1.3
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -80,7 +80,7 @@ services:
depends_on:
- activemq
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.2
image: alfresco/alfresco-transform-core-aio:5.1.3
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -94,7 +94,7 @@ services:
depends_on:
- activemq
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.1.2
image: quay.io/alfresco/alfresco-shared-file-store:4.1.3
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand All @@ -107,7 +107,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:23.2.1
image: quay.io/alfresco/alfresco-share:23.2.2
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand Down
14 changes: 7 additions & 7 deletions docker-compose/pre-release-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ services:
start_period: 1m
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.1.2
image: quay.io/alfresco/alfresco-transform-router:4.1.3
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
Expand All @@ -80,7 +80,7 @@ services:
depends_on:
- activemq
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.1.2
image: alfresco/alfresco-transform-core-aio:5.1.3
mem_limit: 1536m
environment:
JAVA_OPTS: >-
Expand All @@ -94,7 +94,7 @@ services:
depends_on:
- activemq
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.1.2
image: quay.io/alfresco/alfresco-shared-file-store:4.1.3
mem_limit: 512m
environment:
JAVA_OPTS: >-
Expand All @@ -107,7 +107,7 @@ services:
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:23.3.0-A16
image: quay.io/alfresco/alfresco-share:23.3.0-M1
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
Expand Down Expand Up @@ -187,7 +187,7 @@ services:
- "61616:61616" # OpenWire
- "61613:61613" # STOMP
digital-workspace:
image: quay.io/alfresco/alfresco-digital-workspace:4.5.0-9269023247
image: quay.io/alfresco/alfresco-digital-workspace:4.5.0-9858669405
mem_limit: 128m
environment:
APP_CONFIG_PROVIDER: "ECM"
Expand All @@ -197,7 +197,7 @@ services:
APP_CONFIG_PLUGIN_MICROSOFT_ONLINE: "false"
APP_BASE_SHARE_URL: "http://localhost:8080/workspace/#/preview/s"
control-center:
image: quay.io/alfresco/alfresco-control-center:8.5.0-9269023247
image: quay.io/alfresco/alfresco-control-center:8.5.0-9858669405
mem_limit: 128m
environment:
APP_CONFIG_PROVIDER: "ECM"
Expand All @@ -214,7 +214,7 @@ services:
- share
- control-center
sync-service:
image: quay.io/alfresco/service-sync:4.0.1.1-A1
image: quay.io/alfresco/service-sync:5.1.0-M1
mem_limit: 1g
environment:
JAVA_OPTS: >-
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/solr6-override-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
solr6:
image: quay.io/alfresco/search-services:2.0.10
image: quay.io/alfresco/search-services:2.0.11
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
Expand Down
14 changes: 7 additions & 7 deletions helm/acs-sso-example/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ dependencies:
version: 13.4.0
- name: keycloakx
repository: https://codecentric.github.io/helm-charts
version: 2.3.0
version: 2.4.3
- name: alfresco-repository
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.1.3
version: 0.6.0
- name: activemq
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 3.4.1
version: 3.5.4
- name: alfresco-share
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.3.0
version: 1.0.0
- name: alfresco-adf-app
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.1.0-alpha.1
digest: sha256:4f1a6344f79edcc99f5698d72d36cd9b00cf62ba279ce2ecccbe6fb6fea684c0
generated: "2024-02-29T10:43:30.610971+01:00"
version: 0.1.1
digest: sha256:259dbcf60f66181a53f99aed2f5c3625e4c5aeda9d15c21ffc6d012db5fcebc5
generated: "2024-07-11T13:14:17.885114+02:00"
14 changes: 7 additions & 7 deletions helm/acs-sso-example/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ description: |
deployment is destroyed or rolled back!

type: application
version: 0.1.0
appVersion: 23.2.0-A12
version: 1.0.0
appVersion: 23.2.2
home: https://www.alfresco.com
sources:
- https://github.com/Alfresco/acs-deployment
Expand All @@ -33,18 +33,18 @@ dependencies:
alias: repository-database
- name: keycloakx
repository: https://codecentric.github.io/helm-charts
version: 2.3.0
version: 2.4.3
- name: alfresco-repository
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.1.3
version: 0.6.0
- name: activemq
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 3.4.1
version: 3.5.4
- name: alfresco-share
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.3.0
version: 1.0.0
- name: alfresco-adf-app
alias: alfresco-content-app
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 0.1.0-alpha.1
version: 0.1.1
icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
12 changes: 6 additions & 6 deletions helm/acs-sso-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ grand_parent: Helm

# acs-sso-example

![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.2.0-A12](https://img.shields.io/badge/AppVersion-23.2.0--A12-informational?style=flat-square)
![Version: 1.0.0](https://img.shields.io/badge/Version-1.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 23.2.2](https://img.shields.io/badge/AppVersion-23.2.2-informational?style=flat-square)

An example Chart to demonstrate how to compose your own Alfresco platform
with SSO on kubernetes using a nthrid party Keycloak.
Expand Down Expand Up @@ -37,11 +37,11 @@ deployment is destroyed or rolled back!

| Repository | Name | Version |
|------------|------|---------|
| https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.4.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-content-app(alfresco-adf-app) | 0.1.0-alpha.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.1.3 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-share | 0.3.0 |
| https://codecentric.github.io/helm-charts | keycloakx | 2.3.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | activemq | 3.5.4 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-content-app(alfresco-adf-app) | 0.1.1 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-repository | 0.6.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-share | 1.0.0 |
| https://codecentric.github.io/helm-charts | keycloakx | 2.4.3 |
| oci://registry-1.docker.io/bitnamicharts | repository-database(postgresql) | 13.4.0 |

## Values
Expand Down
29 changes: 26 additions & 3 deletions helm/acs-sso-example/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,29 @@ keycloakx:
- --import-realm
http:
relativePath: /auth

livenessProbe: |
httpGet:
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health/live'
port: http
initialDelaySeconds: 0
timeoutSeconds: 5

readinessProbe: |
httpGet:
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health/ready'
port: http
initialDelaySeconds: 10
timeoutSeconds: 1

startupProbe: |
httpGet:
path: '{{ tpl .Values.http.relativePath $ | trimSuffix "/" }}/health'
port: http
initialDelaySeconds: 15
timeoutSeconds: 1
failureThreshold: 60
periodSeconds: 5
ingress:
enabled: true
tls: []
Expand Down Expand Up @@ -169,7 +192,7 @@ alfresco-repository:
replicaCount: 1
image:
repository: alfresco/alfresco-content-repository-community
tag: 23.2.0-A12
tag: 23.2.1
configuration:
repository:
existingConfigMap: repository-properties
Expand Down Expand Up @@ -199,7 +222,7 @@ alfresco-share:
nameOverride: alfresco-share
image:
repository: alfresco/alfresco-share
tag: 23.2.0-A13
tag: 23.2.1
repository:
existingConfigMap:
name: share-repository
Expand Down Expand Up @@ -233,7 +256,7 @@ alfresco-content-app:
tls: []
image:
repository: alfresco/alfresco-content-app
tag: 4.3.0
tag: 4.4.0
pullPolicy: IfNotPresent
env:
APP_CONFIG_PROVIDER: ECM
Expand Down
4 changes: 2 additions & 2 deletions helm/alfresco-content-services/7.2.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.2.2
tag: 7.2.2.1
configuration:
search:
flavor: solr6
Expand Down Expand Up @@ -37,7 +37,7 @@ alfresco-transform-service:
tag: 2.1.2
share:
image:
tag: 7.2.2
tag: 7.2.2.1
alfresco-search:
enabled: true
searchServicesImage:
Expand Down
Loading
Loading