From 16ff9161b0aafc9936584fa1935ac7bdf963e91c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Maciusiak?= <158472457+pmacius@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:27:58 +0200 Subject: [PATCH] OPSEXP-2465 Remove support for ACS 7.0 (#1116) --- README.md | 1 + docker-compose/7.0.N-docker-compose.yml | 195 ------------------ .../7.0.N_values.yaml | 86 -------- updatecli-matrix-targets.yaml | 93 --------- 4 files changed, 1 insertion(+), 374 deletions(-) delete mode 100644 docker-compose/7.0.N-docker-compose.yml delete mode 100644 helm/alfresco-content-services/7.0.N_values.yaml diff --git a/README.md b/README.md index c89a6dff8..becb5e18a 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ file for a version with the latest charts or using the old charts. | unsupported ACS version | Last chart version providing it | |-------------------------|---------------------------------| +| 7.0 | 8.0.1 | | 6.2 | 5.3.0 | | 6.1 | 5.1.1 | diff --git a/docker-compose/7.0.N-docker-compose.yml b/docker-compose/7.0.N-docker-compose.yml deleted file mode 100644 index d64d3d024..000000000 --- a/docker-compose/7.0.N-docker-compose.yml +++ /dev/null @@ -1,195 +0,0 @@ -# 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 -# -# 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 -version: "2" -services: - alfresco: - image: quay.io/alfresco/alfresco-content-repository:7.0.1.10 - mem_limit: 1700m - 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=none - -Dsolr.base.url=/solr - -Dindex.subsystem.name=solr6 - -Dshare.host=127.0.0.1 - -Dshare.port=8080 - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dcsrf.filter.enabled=false - -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/ - -Ddsync.service.uris=http://localhost:9090/alfresco - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=1700m - transform-router: - mem_limit: 512m - image: quay.io/alfresco/alfresco-transform-router:1.4.1 - environment: - JAVA_OPTS: >- - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=512m - 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:2.5.7 - mem_limit: 1536m - environment: - JAVA_OPTS: >- - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=1536m - 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:0.16.1 - mem_limit: 512m - environment: - JAVA_OPTS: >- - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=512m - 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:7.0.1.3 - mem_limit: 1g - environment: - REPO_HOST: "alfresco" - REPO_PORT: "8080" - JAVA_OPTS: >- - -XX:MinRAMPercentage=50 - -XX:MaxRAMPercentage=80 - -XX:MaxRAM=1g - -Dalfresco.host=localhost - -Dalfresco.port=8080 - -Dalfresco.context=alfresco - -Dalfresco.protocol=http - postgres: - image: postgres:13.1 - 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.2.2 - 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 - # HTTP by default - - ALFRESCO_SECURE_COMMS=none - ports: - - "8083:8983" # Browser port - activemq: - image: alfresco/alfresco-activemq:5.16-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:2.6.2 - mem_limit: 128m - environment: - APP_CONFIG_AUTH_TYPE: "BASIC" - BASE_PATH: ./ - proxy: - image: alfresco/alfresco-acs-nginx:3.2.0 - mem_limit: 128m - depends_on: - - alfresco - - digital-workspace - ports: - - "8080:8080" - links: - - digital-workspace - - alfresco - - share - sync-service: - image: quay.io/alfresco/service-sync:3.7.2 - 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 - -XX:MaxRAM=1g - ports: - - "9090:9090" -volumes: - shared-file-store-volume: - driver_opts: - type: tmpfs - device: tmpfs diff --git a/helm/alfresco-content-services/7.0.N_values.yaml b/helm/alfresco-content-services/7.0.N_values.yaml deleted file mode 100644 index 4aae69d22..000000000 --- a/helm/alfresco-content-services/7.0.N_values.yaml +++ /dev/null @@ -1,86 +0,0 @@ -# This values file can be used to install ACS 7.0.x using the latest version of -# the chart -alfresco-repository: - image: - tag: 7.0.1.10 - configuration: - search: - flavor: solr6 -activemq: - image: - repository: quay.io/alfresco/alfresco-activemq - tag: 5.16.7-jre17-rockylinux8 -alfresco-search-enterprise: - enabled: false -elasticsearch: - enabled: false -alfresco-ai-transformer: - image: - tag: 1.3.0 -alfresco-transform-service: - transformrouter: - image: - tag: 1.4.1 - pdfrenderer: - image: - tag: 2.5.7 - imagemagick: - image: - tag: 2.5.7 - libreoffice: - image: - tag: 2.5.7 - tika: - image: - tag: 2.5.7 - transformmisc: - image: - tag: 2.5.7 - filestore: - image: - tag: 0.16.1 -share: - image: - tag: 7.0.1.3 -alfresco-search: - enabled: true - repository: - securecomms: none - searchServicesImage: - tag: 2.0.2.2 - insightEngineImage: - tag: 2.0.2.2 -alfresco-digital-workspace: - image: - tag: 2.6.2 -postgresql: - image: - tag: 13.1.0 -postgresql-sync: - image: - tag: 13.1.0 -alfresco-sync-service: - image: - tag: 3.7.2 -alfresco-connector-ms365: - image: - tag: 1.1.0.1 -alfresco-connector-msteams: - enabled: false -alfresco-control-center: - enabled: false -global: - search: - securecomms: none -dtas: - config: - assertions: - acs: - version: 7.0.1 - modules: - - id: org.alfresco.integrations.google.docs - version: 3.2.1.3 - installed: true - - id: alfresco-aos-module - version: 1.4.0.1 - installed: true diff --git a/updatecli-matrix-targets.yaml b/updatecli-matrix-targets.yaml index 419126a9e..db7d981d9 100644 --- a/updatecli-matrix-targets.yaml +++ b/updatecli-matrix-targets.yaml @@ -727,99 +727,6 @@ matrix: version: helm_target: *helmvalues71 helm_key: $.alfresco-transform-service.tika.image.tag - 7.0.N: - id: 70n - acs: - version: - compose_target: &compose70 >- - docker-compose/7.0.N-docker-compose.yml - compose_key: $.services.alfresco.image - helm_target: &helmvalues70 >- - helm/alfresco-content-services/7.0.N_values.yaml - helm_key: $.alfresco-repository.image.tag - pattern: - image: - activemq: - version: - helm_target: *helmvalues70 - helm_key: $.activemq.image.tag - pattern: - image: - share: - version: - compose_target: *compose70 - compose_key: $.services.share.image - helm_target: *helmvalues70 - helm_key: $.share.image.tag - pattern: - image: - search: - version: - compose_target: *compose70 - compose_key: $.services.solr6.image - helm_target: *helmvalues70 - helm_keys: *search_helm_keys - pattern: - image: - sync: - version: - compose_target: *compose70 - compose_key: $.services.sync-service.image - helm_target: *helmvalues70 - helm_key: $.alfresco-sync-service.image.tag - pattern: - adw: - version: - compose_target: *compose70 - compose_key: $.services.digital-workspace.image - helm_target: *helmvalues70 - helm_key: $.alfresco-digital-workspace.image.tag - pattern: - onedrive: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-connector-ms365.image.tag - pattern: - intelligence: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-ai-transformer.image.tag - trouter: - version: - compose_target: *compose70 - compose_key: $.services.transform-router.image - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.transformrouter.image.tag - sfs: - version: - compose_target: *compose70 - compose_key: $.services.shared-file-store.image - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.filestore.image.tag - tengine-aio: - version: - compose_target: *compose70 - compose_key: $.services.transform-core-aio.image - tengine-misc: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.transformmisc.image.tag - tengine-im: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.imagemagick.image.tag - tengine-lo: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.libreoffice.image.tag - tengine-pdf: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.pdfrenderer.image.tag - tengine-tika: - version: - helm_target: *helmvalues70 - helm_key: $.alfresco-transform-service.tika.image.tag community: id: com acs: