From e92872b2f22e45aaf5152e8b327629555ad6cc7d Mon Sep 17 00:00:00 2001
From: Giovanni Toraldo <giovanni.toraldo@hyland.com>
Date: Fri, 29 Nov 2024 16:11:04 +0100
Subject: [PATCH] drop 7.1 and revert prerelease

---
 .github/workflows/helm-enterprise.yml         |   1 -
 docker-compose/7.1.N-compose.yaml             | 311 ------------------
 docker-compose/pre-release-compose.yaml       |   4 +-
 docker-compose/updatecli-matrix-targets.yaml  |  42 ---
 .../7.1.N_values.yaml                         | 109 ------
 .../pre-release_values.yaml                   |   4 +-
 6 files changed, 4 insertions(+), 467 deletions(-)
 delete mode 100644 docker-compose/7.1.N-compose.yaml
 delete mode 100644 helm/alfresco-content-services/7.1.N_values.yaml

diff --git a/.github/workflows/helm-enterprise.yml b/.github/workflows/helm-enterprise.yml
index 641c0c081..b40faef57 100644
--- a/.github/workflows/helm-enterprise.yml
+++ b/.github/workflows/helm-enterprise.yml
@@ -46,7 +46,6 @@ jobs:
           JQ_FILTER: >-
             [inputs | .charts[] | {name: .name, values: .values[]}
             | del(. | select(.values=="community_values.yaml"))
-            | del(. | select(.values=="7.1.N_values.yaml"))
             | del(. | select(.values=="7.2.N_values.yaml"))
             | select(.name=="alfresco-content-services")]
         run: |
diff --git a/docker-compose/7.1.N-compose.yaml b/docker-compose/7.1.N-compose.yaml
deleted file mode 100644
index eebf8e660..000000000
--- a/docker-compose/7.1.N-compose.yaml
+++ /dev/null
@@ -1,311 +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 compose.yaml 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
-#
-# 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.9
-    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=none
-        -Dsolr.base.url=/solr
-        -Dindex.subsystem.name=solr6
-        -Dshare.host=localhost
-        -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=1900m
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/alfresco/api/-default-/public/alfresco/versions/1/probes/-ready-"]
-      interval: 30s
-      timeout: 3s
-      retries: 5
-      start_period: 1m
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.alfresco.rule=PathPrefix(`/`)"
-      - "traefik.http.services.alfresco.loadbalancer.server.port=8080"
-      - "traefik.http.routers.solrapideny.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/api/solr/.*$`)"
-      - "traefik.http.middlewares.acsfakeauth.basicauth.users=fake:"
-      - "traefik.http.routers.solrapideny.middlewares=acsfakeauth@docker"
-      - "traefik.http.routers.alfrescomicrometer.rule=PathRegexp(`^/alfresco/(wc)?s(ervice)?/prometheus`)"
-      - "traefik.http.middlewares.prometheusipfilter.ipallowlist.sourcerange=127.0.0.0/8"
-      - "traefik.http.routers.alfrescomicrometer.middlewares=prometheusipfilter@docker"
-  transform-router:
-    mem_limit: 512m
-    image: quay.io/alfresco/alfresco-transform-router:2.1.2
-    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"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8095/actuator/health"]
-      interval: 10s
-      timeout: 2s
-      retries: 3
-      start_period: 20s
-    depends_on:
-      activemq:
-        condition: service_healthy
-      shared-file-store:
-        condition: service_healthy
-  transform-core-aio:
-    image: alfresco/alfresco-transform-core-aio:3.1.2
-    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"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8090/ready"]
-      interval: 20s
-      timeout: 2s
-      retries: 3
-      start_period: 10s
-    depends_on:
-      activemq:
-        condition: service_healthy
-      shared-file-store:
-        condition: service_healthy
-  shared-file-store:
-    image: quay.io/alfresco/alfresco-shared-file-store:2.1.2
-    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"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8099/ready"]
-      interval: 20s
-      timeout: 2s
-      retries: 3
-      start_period: 10s
-    volumes:
-      - shared-file-store-volume:/tmp/Alfresco/sfs
-  share:
-    image: quay.io/alfresco/alfresco-share:7.1.1.9
-    mem_limit: 1g
-    environment:
-      CSRF_FILTER_ORIGIN: http://localhost:8080
-      CSRF_FILTER_REFERER: http://localhost:8080/share/.*
-      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
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/share"]
-      interval: 20s
-      timeout: 2s
-      retries: 3
-      start_period: 15s
-    depends_on:
-      alfresco:
-        condition: service_healthy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.share.rule=PathPrefix(`/share`)"
-      - "traefik.http.services.share.loadbalancer.server.port=8080"
-      - "traefik.http.routers.proxiedsolrapideny.rule=PathRegexp(`^/share/proxy/alfresco(-(noauth|feed|api))?/api/solr/`)"
-      - "traefik.http.middlewares.sharefakeauth.basicauth.users=fake:"
-      - "traefik.http.routers.proxiedsolrapideny.middlewares=sharefakeauth@docker"
-  postgres:
-    image: postgres:13.3
-    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"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $$POSTGRES_DB -U $$POSTGRES_USER"]
-      interval: 10s
-      timeout: 3s
-      retries: 3
-      start_period: 5s
-  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
-    healthcheck:
-      test: ["CMD", "/opt/activemq/bin/activemq", "query", "--objname", "type=Broker,brokerName=*,service=Health", "|", "grep", "Good"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 5s
-  digital-workspace:
-    image: quay.io/alfresco/alfresco-digital-workspace:4.4.1
-    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"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.adw.rule=PathPrefix(`/workspace`)"
-      - "traefik.http.middlewares.adwforceslash.redirectregex.regex=^(.*/workspace)$$"
-      - "traefik.http.middlewares.adwforceslash.redirectregex.replacement=$${1}/"
-      - "traefik.http.middlewares.adwroot.stripprefix.prefixes=/workspace"
-      - "traefik.http.middlewares.adwchain.chain.middlewares=adwforceslash,adwroot"
-      - "traefik.http.routers.adw.middlewares=adwchain@docker"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8080/"]
-      interval: 10s
-      timeout: 1s
-      retries: 3
-      start_period: 1s
-  proxy:
-    image: traefik:3.1
-    mem_limit: 128m
-    command:
-      - "--api.insecure=true"
-      - "--providers.docker=true"
-      - "--entrypoints.web.address=:8080"
-      - "--entryPoints.traefik.address=:8888"
-      - "--accesslog=true"
-      - "--providers.docker.exposedByDefault=false"
-      - "--ping.entrypoint=web"
-      - "--ping=true"
-    ports:
-      - "8080:8080"
-      - "8888:8888"
-    healthcheck:
-      test: ["CMD", "traefik", "healthcheck", "--ping"]
-      interval: 20s
-      timeout: 10s
-      retries: 3
-      start_period: 10s
-    security_opt:
-      - label=disable # Required for accessing the Docker socket on Selinux enabled systems
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
-  sync-service:
-    image: quay.io/alfresco/service-sync:3.11.3
-    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"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9090/alfresco/healthcheck"]
-      interval: 30s
-      timeout: 2s
-      retries: 3
-      start_period: 20s
-    depends_on:
-      postgres:
-        condition: service_healthy
-      alfresco:
-        condition: service_healthy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.syncservice.rule=PathPrefix(`/syncservice`)"
-      - "traefik.http.services.sync-service.loadbalancer.server.port=9090"
-      - "traefik.http.middlewares.syncservice.replacepathregex.regex=^/syncservice/(.*)"
-      - "traefik.http.middlewares.syncservice.replacepathregex.replacement=/alfresco/$$1"
-      - "traefik.http.routers.syncservice.middlewares=syncservice@docker"
-volumes:
-  shared-file-store-volume:
-    driver_opts:
-      type: tmpfs
-      device: tmpfs
diff --git a/docker-compose/pre-release-compose.yaml b/docker-compose/pre-release-compose.yaml
index deda2ba4d..69e055be7 100644
--- a/docker-compose/pre-release-compose.yaml
+++ b/docker-compose/pre-release-compose.yaml
@@ -15,7 +15,7 @@
 #
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:23.4.0-A9
+    image: quay.io/alfresco/alfresco-content-repository:25.1.0-A.1
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
@@ -134,7 +134,7 @@ services:
     volumes:
       - shared-file-store-volume:/tmp/Alfresco/sfs
   share:
-    image: quay.io/alfresco/alfresco-share:23.4.0-A9
+    image: quay.io/alfresco/alfresco-share:25.1.0-A.1
     mem_limit: 1g
     environment:
       CSRF_FILTER_ORIGIN: http://localhost:8080
diff --git a/docker-compose/updatecli-matrix-targets.yaml b/docker-compose/updatecli-matrix-targets.yaml
index c0a8dd4ef..1b1f6ed09 100644
--- a/docker-compose/updatecli-matrix-targets.yaml
+++ b/docker-compose/updatecli-matrix-targets.yaml
@@ -285,48 +285,6 @@ matrix:
       compose_target: *compose72
       compose_key: $.services.transform-core-aio.image
 
-  7.1.N:
-    id: 71n
-    acs:
-      version:
-      compose_target: &compose71 >-
-        docker-compose/7.1.N-compose.yaml
-      compose_key: $.services.alfresco.image
-      pattern:
-      image:
-    activemq:
-      version:
-      pattern:
-      image:
-    share:
-      version:
-      compose_target: *compose71
-      compose_key: $.services.share.image
-      pattern:
-      image:
-    sync:
-      version:
-      compose_target: *compose71
-      compose_key: $.services.sync-service.image
-      pattern:
-    adw:
-      version:
-      compose_target: *compose71
-      compose_key: $.services.digital-workspace.image
-      pattern:
-    trouter:
-      version:
-      compose_target: *compose71
-      compose_key: $.services.transform-router.image
-    sfs:
-      version:
-      compose_target: *compose71
-      compose_key: $.services.shared-file-store.image
-    tengine-aio:
-      version:
-      compose_target: *compose71
-      compose_key: $.services.transform-core-aio.image
-
   community: &community
     id: com
     acs:
diff --git a/helm/alfresco-content-services/7.1.N_values.yaml b/helm/alfresco-content-services/7.1.N_values.yaml
deleted file mode 100644
index 4befd4917..000000000
--- a/helm/alfresco-content-services/7.1.N_values.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-# This values file can be used to install ACS 7.1.x using the latest version of
-# the chart
-alfresco-repository:
-  image:
-    tag: 7.1.1.9
-  configuration:
-    search:
-      flavor: solr6
-activemq:
-  image:
-    repository: quay.io/alfresco/alfresco-activemq
-    tag: 5.16.7-jre17-rockylinux8
-alfresco-ai-transformer:
-  image:
-    tag: 1.5.1
-alfresco-transform-service:
-  transformrouter:
-    image:
-      tag: 2.1.2
-  pdfrenderer:
-    image:
-      tag: 3.1.2
-  imagemagick:
-    image:
-      tag: 3.1.2
-  libreoffice:
-    image:
-      tag: 3.1.2
-  tika:
-    image:
-      tag: 3.1.2
-  transformmisc:
-    image:
-      tag: 3.1.2
-  filestore:
-    image:
-      tag: 2.1.2
-share:
-  image:
-    tag: 7.1.1.9
-alfresco-search:
-  enabled: true
-  repository:
-    securecomms: none
-  searchServicesImage:
-    tag: 2.0.13
-  insightEngineImage:
-    tag: 2.0.13
-alfresco-search-enterprise:
-  enabled: false
-  liveIndexing:
-    mediation:
-      image:
-        tag: 3.1.1.1
-    content:
-      image:
-        tag: 3.1.1.1
-    metadata:
-      image:
-        tag: 3.1.1.1
-    path:
-      image:
-        tag: 3.1.1.1
-  reindexing:
-    image:
-      tag: 3.1.1.1
-elasticsearch:
-  enabled: false
-postgresql:
-  image:
-    tag: 13.3.0
-postgresql-sync:
-  image:
-    tag: 13.3.0
-alfresco-digital-workspace:
-  image:
-    tag: 4.4.1
-alfresco-sync-service:
-  image:
-    tag: 3.11.3
-alfresco-connector-msteams:
-  image:
-    tag: 1.1.0
-alfresco-connector-ms365:
-  image:
-    tag: 1.1.1
-alfresco-control-center:
-  enabled: false
-elasticsearch-audit:
-  enabled: false
-kibana-audit:
-  enabled: false
-alfresco-audit-storage:
-  enabled: false
-global:
-  search:
-    securecomms: none
-dtas:
-  config:
-    assertions:
-      acs:
-        version: 7.1.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/helm/alfresco-content-services/pre-release_values.yaml b/helm/alfresco-content-services/pre-release_values.yaml
index 093910c3b..67266f287 100644
--- a/helm/alfresco-content-services/pre-release_values.yaml
+++ b/helm/alfresco-content-services/pre-release_values.yaml
@@ -2,7 +2,7 @@
 # the chart
 alfresco-repository:
   image:
-    tag: 23.4.0-A9
+    tag: 25.1.0-A.1
 activemq:
   image:
     repository: quay.io/alfresco/alfresco-activemq
@@ -34,7 +34,7 @@ alfresco-ai-transformer:
     tag: 3.1.7
 share:
   image:
-    tag: 23.4.0-A9
+    tag: 25.1.0-A.1
 alfresco-search:
   searchServicesImage:
     tag: 2.1.0-A9