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-2445 Prepare for 8.0.0-M.1 release #1073

Merged
merged 17 commits into from
Jan 22, 2024
Merged
9 changes: 5 additions & 4 deletions .github/workflows/bumpVersions.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
name: Bump versions
run-name: Bump ${{ inputs.update-type }} using alfresco-updatecli/${{ inputs.alfresco-updatecli-ref }}

on:
push:
Expand All @@ -22,7 +23,7 @@ on:
default: master

env:
UPDATE_CLI_VERSION: v0.66.1
UPDATE_CLI_VERSION: v0.71.0
DEFAULT_BRANCH_NAME: master

jobs:
Expand All @@ -47,7 +48,7 @@ jobs:
with:
version: ${{ env.UPDATE_CLI_VERSION }}

- run: updatecli apply --experimental
- run: updatecli apply
env:
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

Expand All @@ -62,7 +63,7 @@ jobs:
uses: stefanzweifel/[email protected]
with:
commit_message: |
🛠 Updatecli pipeline bump
🛠 Updatecli pipeline charts bump
commit_user_name: ${{ vars.BOT_GITHUB_USERNAME }}
commit_user_email: ${{ vars.BOT_GITHUB_EMAIL }}
branch: ${{ github.ref_name == env.DEFAULT_BRANCH_NAME && 'updatecli-bump-helm' || github.ref_name }}
Expand Down Expand Up @@ -117,7 +118,7 @@ jobs:
uses: stefanzweifel/[email protected]
with:
commit_message: |
🛠 Updatecli pipeline acs bump
🛠 Updatecli pipeline values bump
commit_user_name: ${{ vars.BOT_GITHUB_USERNAME }}
commit_user_email: ${{ vars.BOT_GITHUB_EMAIL }}
branch: ${{ github.ref_name == env.DEFAULT_BRANCH_NAME && 'updatecli-bump-acs' || github.ref_name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

env:
# https://pre-commit.com/#temporarily-disabling-hooks
SKIP: helm-docs,helm-deps-build,helm-lint,checkov
SKIP: helm-docs,helm-deps-build,helmlint,checkov

jobs:
pre_commit:
Expand Down
5 changes: 4 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ repos:
rev: v2.1.0
hooks:
- id: helm-deps-build
- id: helm-lint
- repo: https://github.com/gruntwork-io/pre-commit
rev: v0.1.23
hooks:
- id: helmlint
- repo: https://github.com/bridgecrewio/checkov.git
rev: 2.3.288
hooks:
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ The table below shows the exact version of ACS deployed with each chart version/
| [7.0.1][7.0.1] | 23.1.1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 |
| [7.0.2][7.0.2] | 23.1.1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 |
| [7.0.3][7.0.3] | 23.1.1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 |
| [7.1.0-M.1][7.1.0-M.1] | 23.2.0-M1 | 7.4.1.3 | 7.3.1.2 | 7.2.1.13 | 7.1.1.10 | 7.0.1.10 | 23.1.0 |

[5.0.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v5.0.1
[5.1.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v5.1.1
Expand All @@ -104,6 +105,7 @@ The table below shows the exact version of ACS deployed with each chart version/
[7.0.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.1
[7.0.2]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.2
[7.0.3]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.0.3
[7.1.0-M.1]: https://github.com/Alfresco/acs-deployment/releases/tag/v7.1.0-M.1

### Why there is no 5.4.0?

Expand Down
203 changes: 203 additions & 0 deletions docker-compose/23.N-docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
# This docker-compose file will spin up an ACS cluster on a local host.
# It requires a minimum of 13GB Memory to distribute among containers.
#
# For performance tuning, assign the container memory and give a percentage of
# it to the JVM. Use either the -Xms,-Xmx flags or the newly added flags in
# java 10+: -XX:MaxRAMPercentage and -XX:MinRAMPercentage.
# More details here:
# https://www.oracle.com/technetwork/java/javase/10-relnote-issues-4108729.html
#
# Note: The docker-compose file from github.com is a limited trial that goes
# into read-only mode after 2 days. Get the latest docker-compose.yml file with
# a 30-day trial license by accessing the Alfresco Content Services trial
# download page at:
# https://www.alfresco.com/platform/content-services-ecm/trial/download
#
# Using version 2 as 3 does not support resource constraint options
# (cpu_*, mem_* limits) for non swarm mode in Compose
version: "2"
services:
alfresco:
image: quay.io/alfresco/alfresco-content-repository:23.1.1
mem_limit: 1900m
environment:
JAVA_TOOL_OPTIONS: >-
-Dencryption.keystore.type=JCEKS
-Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding
-Dencryption.keyAlgorithm=DESede
-Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore
-Dmetadata-keystore.password=mp6yc0UD9e
-Dmetadata-keystore.aliases=metadata
-Dmetadata-keystore.metadata.password=oKIWzVdEdA
-Dmetadata-keystore.metadata.algorithm=DESede
JAVA_OPTS: >-
-Ddb.driver=org.postgresql.Driver
-Ddb.username=alfresco
-Ddb.password=alfresco
-Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-Dsolr.host=solr6
-Dsolr.port=8983
-Dsolr.secureComms=secret
-Dsolr.sharedSecret=secret
-Dsolr.base.url=/solr
-Dindex.subsystem.name=solr6
-Dshare.host=127.0.0.1
-Dshare.port=8080
-Dalfresco.host=localhost
-Dalfresco.port=8080
-Daos.baseUrlOverwrite=http://localhost:8080/alfresco/aos
-Dmessaging.broker.url="failover:(nio://activemq:61616)?timeout=3000&jms.useCompression=true"
-Ddeployment.method=DOCKER_COMPOSE
-Dtransform.service.enabled=true
-Dtransform.service.url=http://transform-router:8095
-Dsfs.url=http://shared-file-store:8099/
-DlocalTransform.core-aio.url=http://transform-core-aio:8090/
-Dcsrf.filter.enabled=false
-Ddsync.service.uris=http://localhost:9090/alfresco
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
transform-router:
mem_limit: 512m
image: quay.io/alfresco/alfresco-transform-router:4.0.1
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
ACTIVEMQ_URL: nio://activemq:61616
CORE_AIO_URL: http://transform-core-aio:8090
FILE_STORE_URL: >-
http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file
ports:
- "8095:8095"
links:
- activemq
transform-core-aio:
image: alfresco/alfresco-transform-core-aio:5.0.1
mem_limit: 1536m
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
ACTIVEMQ_URL: nio://activemq:61616
FILE_STORE_URL: >-
http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file
ports:
- "8090:8090"
links:
- activemq
shared-file-store:
image: quay.io/alfresco/alfresco-shared-file-store:4.0.1
mem_limit: 512m
environment:
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
scheduler.content.age.millis: 86400000
scheduler.cleanup.interval: 86400000
ports:
- "8099:8099"
volumes:
- shared-file-store-volume:/tmp/Alfresco/sfs
share:
image: quay.io/alfresco/alfresco-share:23.1.1
mem_limit: 1g
environment:
REPO_HOST: "alfresco"
REPO_PORT: "8080"
JAVA_OPTS: >-
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
-Dalfresco.host=localhost
-Dalfresco.port=8080
-Dalfresco.context=alfresco
-Dalfresco.protocol=http
postgres:
image: postgres:14.4
mem_limit: 512m
environment:
- POSTGRES_PASSWORD=alfresco
- POSTGRES_USER=alfresco
- POSTGRES_DB=alfresco
command: postgres -c max_connections=300 -c log_min_messages=LOG
ports:
- "5432:5432"
solr6:
image: quay.io/alfresco/search-services:2.0.9
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
SOLR_ALFRESCO_HOST: "alfresco"
SOLR_ALFRESCO_PORT: "8080"
# Alfresco needs to know how to call solr
SOLR_SOLR_HOST: "solr6"
SOLR_SOLR_PORT: "8983"
# Create the default alfresco and archive cores
SOLR_CREATE_ALFRESCO_DEFAULTS: "alfresco,archive"
# HTTPS or SECRET
ALFRESCO_SECURE_COMMS: "secret"
# SHARED SECRET VALUE
JAVA_TOOL_OPTIONS: >-
-Dalfresco.secureComms.secret=secret
ports:
- "8083:8983" # Browser port
activemq:
image: alfresco/alfresco-activemq:5.18-jre17-rockylinux8
mem_limit: 1g
ports:
- "8161:8161" # Web Console
- "5672:5672" # AMQP
- "61616:61616" # OpenWire
- "61613:61613" # STOMP
digital-workspace:
image: quay.io/alfresco/alfresco-digital-workspace:4.3.0
mem_limit: 128m
environment:
APP_CONFIG_PROVIDER: "ECM"
APP_CONFIG_AUTH_TYPE: "BASIC"
BASE_PATH: ./
APP_CONFIG_PLUGIN_PROCESS_SERVICE: "false"
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.3.0
mem_limit: 128m
environment:
APP_CONFIG_PROVIDER: "ECM"
APP_CONFIG_AUTH_TYPE: "BASIC"
BASE_PATH: ./
proxy:
image: alfresco/alfresco-acs-nginx:3.4.2
mem_limit: 128m
depends_on:
- alfresco
- digital-workspace
- control-center
ports:
- "8080:8080"
links:
- digital-workspace
- alfresco
- share
- control-center
sync-service:
image: quay.io/alfresco/service-sync:4.0.1
mem_limit: 1g
environment:
JAVA_OPTS: >-
-Dsql.db.driver=org.postgresql.Driver
-Dsql.db.url=jdbc:postgresql://postgres:5432/alfresco
-Dsql.db.username=alfresco
-Dsql.db.password=alfresco
-Dmessaging.broker.host=activemq
-Drepo.hostname=alfresco
-Drepo.port=8080
-Ddw.server.applicationConnectors[0].type=http
-XX:MinRAMPercentage=50
-XX:MaxRAMPercentage=80
ports:
- "9090:9090"
volumes:
shared-file-store-volume:
driver_opts:
type: tmpfs
device: tmpfs
2 changes: 1 addition & 1 deletion docker-compose/7.4.N-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ services:
ports:
- "5432:5432"
solr6:
image: quay.io/alfresco/search-services:2.0.8.2
image: quay.io/alfresco/search-services:2.0.9
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/community-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ services:
ports:
- "5432:5432"
solr6:
image: docker.io/alfresco/alfresco-search-services:2.0.8.2
image: docker.io/alfresco/alfresco-search-services:2.0.9
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
Expand Down
8 changes: 4 additions & 4 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.1.1
image: quay.io/alfresco/alfresco-content-repository:23.2.0-M1
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:23.1.1
image: quay.io/alfresco/alfresco-share:23.2.0-M1
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.8.2
image: quay.io/alfresco/search-services:2.0.9
mem_limit: 2g
environment:
# Solr needs to know how to register itself with Alfresco
Expand Down Expand Up @@ -180,7 +180,7 @@ services:
- share
- control-center
sync-service:
image: quay.io/alfresco/service-sync:4.0.1
image: quay.io/alfresco/service-sync:5.0.0-M2
mem_limit: 1g
environment:
JAVA_OPTS: >-
Expand Down
Loading
Loading