From acbf4d615ee91e4e9ea4fea6966b6a4275f16bb4 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Tue, 23 Jul 2024 18:03:49 +0200
Subject: [PATCH 01/16] add googledrive AMP

---
 repository/Dockerfile     | 2 ++
 repository/artifacts.json | 7 +++++++
 scripts/fetch-artifact.sh | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/repository/Dockerfile b/repository/Dockerfile
index a752c0a7..43c0fb01 100644
--- a/repository/Dockerfile
+++ b/repository/Dockerfile
@@ -9,10 +9,12 @@ USER root
 RUN yum install -y unzip
 
 ADD alfresco-content-services-distribution-*.zip /tmp/
+ADD amps /tmp/amps
 
 RUN unzip /tmp/alfresco-content-services-distribution-*.zip -d /tmp/distribution
 RUN mkdir -m 750 -p ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/ ${CATALINA_HOME}/alf_data
 RUN unzip /tmp/distribution/web-server/webapps/alfresco.war -d ${CATALINA_HOME}/webapps/alfresco/
+RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar install /tmp/amps/ ${CATALINA_HOME}/webapps/alfresco -nobackup -directory
 RUN cp -a /tmp/distribution/web-server/conf/* ${CATALINA_HOME}/conf/ && rm -f ${CATALINA_HOME}/conf/Catalina/localhost/share.xml
 RUN cp -a /tmp/distribution/web-server/lib/* ${CATALINA_HOME}/lib/
 RUN cp -a /tmp/distribution/licenses ${CATALINA_HOME}/
diff --git a/repository/artifacts.json b/repository/artifacts.json
index 7090e3d7..8cebccbe 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -1,6 +1,13 @@
 {
   "artifacts": {
     "acs23": [
+      {
+        "name": "alfresco-googledrive-repo-enterprise",
+        "version": "4.1.0",
+        "path": "repository/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco.integrations"
+      },
       {
         "name": "alfresco-content-services-distribution",
         "version": "23.2.2",
diff --git a/scripts/fetch-artifact.sh b/scripts/fetch-artifact.sh
index 38d0483a..30c66e96 100755
--- a/scripts/fetch-artifact.sh
+++ b/scripts/fetch-artifact.sh
@@ -17,7 +17,7 @@ for i in $(find . -name artifacts.json -mindepth 2); do
     ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].group" $i)
     ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].path" $i)
     echo "Downloading $ARTIFACT_GROUP:$ARTIFACT_NAME $ARTIFACT_VERSION from $ARTIFACT_BASEURL"
-    wget "${ARTIFACT_BASEURL}/${ARTIFACT_GROUP/\./\/}/${ARTIFACT_NAME}/${ARTIFACT_VERSION}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}" \
+    wget "${ARTIFACT_BASEURL}/${ARTIFACT_GROUP//\./\/}/${ARTIFACT_NAME}/${ARTIFACT_VERSION}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}" \
       -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}
   done
 done

From dc5f1f7d8942d2c97b1374895a392637f467573f Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Tue, 23 Jul 2024 19:08:35 +0200
Subject: [PATCH 02/16] fix permissions issue

---
 repository/Dockerfile | 10 ++++++----
 tomcat/Dockerfile     |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/repository/Dockerfile b/repository/Dockerfile
index 43c0fb01..ee1b9e9f 100644
--- a/repository/Dockerfile
+++ b/repository/Dockerfile
@@ -9,17 +9,16 @@ USER root
 RUN yum install -y unzip
 
 ADD alfresco-content-services-distribution-*.zip /tmp/
-ADD amps /tmp/amps
 
 RUN unzip /tmp/alfresco-content-services-distribution-*.zip -d /tmp/distribution
-RUN mkdir -m 750 -p ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/ ${CATALINA_HOME}/alf_data
+RUN mkdir -m 750 -p ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/
+RUN mkdir -m 770 ${CATALINA_HOME}/alf_data/
 RUN unzip /tmp/distribution/web-server/webapps/alfresco.war -d ${CATALINA_HOME}/webapps/alfresco/
-RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar install /tmp/amps/ ${CATALINA_HOME}/webapps/alfresco -nobackup -directory
 RUN cp -a /tmp/distribution/web-server/conf/* ${CATALINA_HOME}/conf/ && rm -f ${CATALINA_HOME}/conf/Catalina/localhost/share.xml
 RUN cp -a /tmp/distribution/web-server/lib/* ${CATALINA_HOME}/lib/
 RUN cp -a /tmp/distribution/licenses ${CATALINA_HOME}/
 RUN cp -a /tmp/distribution/keystore/metadata-keystore/keystore* ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/
-RUN chmod -R o= ${CATALINA_HOME}/
+RUN chmod -R o-rwx ${CATALINA_HOME}/
 RUN sed -i 's|shared.loader=|shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar|' \
   ${CATALINA_HOME}/conf/catalina.properties
 RUN sed -i 's|../modules/platform|modules/platform|' ${CATALINA_HOME}/conf/Catalina/localhost/alfresco.xml
@@ -28,6 +27,9 @@ RUN sed -i \
   -re "s|(appender.rolling.filePattern=)(alfresco.log.%d\{yyyy-MM-dd\})|\1${CATALINA_HOME}/logs\/\2|" \
   ${CATALINA_HOME}/webapps/alfresco/WEB-INF/classes/log4j2.properties
 
+ADD amps /tmp/amps
+RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar install /tmp/amps/ ${CATALINA_HOME}/webapps/alfresco -nobackup -directory
+
 FROM tomcat_base AS repo-rhlike
 ARG ALFRESCO_REPO_USER_ID
 ARG ALFRESCO_REPO_GROUP_ID
diff --git a/tomcat/Dockerfile b/tomcat/Dockerfile
index 8331d825..79054f7f 100644
--- a/tomcat/Dockerfile
+++ b/tomcat/Dockerfile
@@ -123,7 +123,8 @@ COPY --chown=:tomcat --chmod=640 --from=tomcat_dist /build/tomcat $CATALINA_HOME
 COPY --chown=:tomcat --chmod=640 --from=tcnative_build /usr/local/tcnative $TOMCAT_NATIVE_LIBDIR
 SHELL ["/bin/bash", "-euo", "pipefail", "-c"]
 RUN mkdir -m 770 logs temp work && chgrp tomcat . logs temp work; \
-  chmod og+x bin/*.sh; \
+  find . -type d -exec chmod ug+rx {} +; \
+  chmod ug+rx bin/*.sh; \
   # verify Tomcat Native is working properly
   nativeLines="$(catalina.sh configtest 2>&1 | grep -c 'Loaded Apache Tomcat Native library')" && \
   test $nativeLines -ge 1 || exit 1

From f97ffd25c89006695329a0ac09111abe1e43e577 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 24 Jul 2024 15:30:12 +0200
Subject: [PATCH 03/16] add variable for artifact repository name

---
 repository/artifacts.json               | 6 ++++--
 scripts/fetch-artifact.sh               | 3 ++-
 search/enterprise/common/artifacts.json | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/repository/artifacts.json b/repository/artifacts.json
index 8cebccbe..65bb1112 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -6,14 +6,16 @@
         "version": "4.1.0",
         "path": "repository/amps",
         "classifier": ".amp",
-        "group": "org.alfresco.integrations"
+        "group": "org.alfresco.integrations",
+        "repository": "enterprise-releases"
       },
       {
         "name": "alfresco-content-services-distribution",
         "version": "23.2.2",
         "path": "repository",
         "classifier": ".zip",
-        "group": "org.alfresco"
+        "group": "org.alfresco",
+        "repository": "enterprise-releases"
       }
     ]
   }
diff --git a/scripts/fetch-artifact.sh b/scripts/fetch-artifact.sh
index 30c66e96..7ad2c095 100755
--- a/scripts/fetch-artifact.sh
+++ b/scripts/fetch-artifact.sh
@@ -10,12 +10,13 @@ cd ${REPO_ROOT}/..
 
 for i in $(find . -name artifacts.json -mindepth 2); do
   for j in $(jq -r ".artifacts.acs${INDEX_KEY} | keys | .[]" $i); do
-    ARTIFACT_BASEURL="https://nexus.alfresco.com/nexus/service/local/repositories/enterprise-releases"
+    ARTIFACT_REPO=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].repository" $i)
     ARTIFACT_NAME=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].name" $i)
     ARTIFACT_VERSION=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].version" $i)
     ARTIFACT_EXT=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].classifier" $i)
     ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].group" $i)
     ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].path" $i)
+    ARTIFACT_BASEURL="https://nexus.alfresco.com/nexus/service/local/repositories/${ARTIFACT_REPO}/content"
     echo "Downloading $ARTIFACT_GROUP:$ARTIFACT_NAME $ARTIFACT_VERSION from $ARTIFACT_BASEURL"
     wget "${ARTIFACT_BASEURL}/${ARTIFACT_GROUP//\./\/}/${ARTIFACT_NAME}/${ARTIFACT_VERSION}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}" \
       -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}
diff --git a/search/enterprise/common/artifacts.json b/search/enterprise/common/artifacts.json
index 00d9f279..092bc8d9 100644
--- a/search/enterprise/common/artifacts.json
+++ b/search/enterprise/common/artifacts.json
@@ -6,6 +6,7 @@
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
+        "repository": "enterprise-releases",
         "group": "org.alfresco"
       },
       {
@@ -13,6 +14,7 @@
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
+        "repository": "enterprise-releases",
         "group": "org.alfresco"
       },
       {
@@ -20,6 +22,7 @@
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
+        "repository": "enterprise-releases",
         "group": "org.alfresco"
       },
       {
@@ -27,6 +30,7 @@
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
+        "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
     ]

From 0dee5707f16e3254c0c7a57e0c3e7d2369f815e9 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 24 Jul 2024 15:59:24 +0200
Subject: [PATCH 04/16] add share-services amp (google dependency)

---
 repository/Dockerfile     | 2 ++
 repository/artifacts.json | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/repository/Dockerfile b/repository/Dockerfile
index ee1b9e9f..e38afd49 100644
--- a/repository/Dockerfile
+++ b/repository/Dockerfile
@@ -11,6 +11,7 @@ RUN yum install -y unzip
 ADD alfresco-content-services-distribution-*.zip /tmp/
 
 RUN unzip /tmp/alfresco-content-services-distribution-*.zip -d /tmp/distribution
+RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar list /tmp/distribution/web-server/webapps/alfresco.war
 RUN mkdir -m 750 -p ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/
 RUN mkdir -m 770 ${CATALINA_HOME}/alf_data/
 RUN unzip /tmp/distribution/web-server/webapps/alfresco.war -d ${CATALINA_HOME}/webapps/alfresco/
@@ -29,6 +30,7 @@ RUN sed -i \
 
 ADD amps /tmp/amps
 RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar install /tmp/amps/ ${CATALINA_HOME}/webapps/alfresco -nobackup -directory
+RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar list ${CATALINA_HOME}/webapps/alfresco
 
 FROM tomcat_base AS repo-rhlike
 ARG ALFRESCO_REPO_USER_ID
diff --git a/repository/artifacts.json b/repository/artifacts.json
index 65bb1112..793a65e8 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -1,6 +1,14 @@
 {
   "artifacts": {
     "acs23": [
+      {
+        "name": "alfresco-share-services",
+        "version": "23.2.2.3",
+        "path": "repository/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco",
+        "repository": "releases"
+      },
       {
         "name": "alfresco-googledrive-repo-enterprise",
         "version": "4.1.0",

From 916f2e4b74bacce9813e9fb7114ffb9444a08daf Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 24 Jul 2024 17:06:39 +0200
Subject: [PATCH 05/16] add device-sync amp

---
 repository/artifacts.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/repository/artifacts.json b/repository/artifacts.json
index 793a65e8..f5afa60d 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -9,6 +9,14 @@
         "group": "org.alfresco",
         "repository": "releases"
       },
+      {
+        "name": "alfresco-device-sync-repo",
+        "version": "5.0.0",
+        "path": "repository/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco.services.sync",
+        "repository": "enterprise-releases"
+      },
       {
         "name": "alfresco-googledrive-repo-enterprise",
         "version": "4.1.0",

From bcccd48e03e27ffe4e0e3bdfb25a48008a25122f Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Wed, 24 Jul 2024 17:17:08 +0200
Subject: [PATCH 06/16] add amps readme

---
 repository/amps/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 repository/amps/README.md

diff --git a/repository/amps/README.md b/repository/amps/README.md
new file mode 100644
index 00000000..77f40888
--- /dev/null
+++ b/repository/amps/README.md
@@ -0,0 +1,18 @@
+# Alfresco repository AMPs
+
+Place here your Alfresco module Packages (AMPs) to be installed in the Alfresco
+repository.
+
+AMP packages should have the `.amp` extension and stick to he Alfresco module
+packaging format as described in the [Alfresco
+documentation](https://docs.alfresco.com/content-services/latest/develop/extension-packaging/#alfresco-module-package-amp).
+
+The [in-process Alfresco
+SDK](https://docs.alfresco.com/content-services/latest/develop/sdk/) provides a
+way to build well structured AMPs.
+
+> Note that AMPs are not the recommanded way to extend Alfresco. You should
+> prefer using the Alfresco SDK to build your extensions as JARs even better,
+> use the [out-of-process Alfresco
+> SDK](https://docs.alfresco.com/content-services/latest/develop/oop-sdk/) to
+> build Docker images with your extensions.

From d723c3f5561ecbf774c0ece75ecc5db343690b33 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 15:07:28 +0200
Subject: [PATCH 07/16] adapt script to nexus3 url patterns

---
 repository/artifacts.json         |  2 +-
 repository/distribution/README.md | 22 ++++++++++++++++++++++
 scripts/fetch-artifact.sh         |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 repository/distribution/README.md

diff --git a/repository/artifacts.json b/repository/artifacts.json
index f5afa60d..bcd0b9d9 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -28,7 +28,7 @@
       {
         "name": "alfresco-content-services-distribution",
         "version": "23.2.2",
-        "path": "repository",
+        "path": "repository/distribution",
         "classifier": ".zip",
         "group": "org.alfresco",
         "repository": "enterprise-releases"
diff --git a/repository/distribution/README.md b/repository/distribution/README.md
new file mode 100644
index 00000000..3b1194a1
--- /dev/null
+++ b/repository/distribution/README.md
@@ -0,0 +1,22 @@
+# Alfresco repository distribution
+
+Place here the version of Alfresco Content Services distribution you want to
+use in your Docker image.
+Distribution file must be a ZIP file with the expected structure of an Alfresco
+Content Services distribution.
+
+```tree
+keystore/
+|_metadata-keystore/
+bin/
+licenses/
+|_3rd-party/
+web-server/
+|_webapps/
+|_shared/
+  |_classes/
+    |_alfresco/
+|_conf/
+  |_Catalina/
+    |_localhost/
+```
diff --git a/scripts/fetch-artifact.sh b/scripts/fetch-artifact.sh
index 7ad2c095..bdd062e7 100755
--- a/scripts/fetch-artifact.sh
+++ b/scripts/fetch-artifact.sh
@@ -16,7 +16,7 @@ for i in $(find . -name artifacts.json -mindepth 2); do
     ARTIFACT_EXT=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].classifier" $i)
     ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].group" $i)
     ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].path" $i)
-    ARTIFACT_BASEURL="https://nexus.alfresco.com/nexus/service/local/repositories/${ARTIFACT_REPO}/content"
+    ARTIFACT_BASEURL="https://nexus.alfresco.com/nexus/service/local/repositories/${ARTIFACT_REPO}"
     echo "Downloading $ARTIFACT_GROUP:$ARTIFACT_NAME $ARTIFACT_VERSION from $ARTIFACT_BASEURL"
     wget "${ARTIFACT_BASEURL}/${ARTIFACT_GROUP//\./\/}/${ARTIFACT_NAME}/${ARTIFACT_VERSION}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}" \
       -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}

From ec4c786544e3c6d29e3bdd62f0308f2d4b77bb45 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 15:08:52 +0200
Subject: [PATCH 08/16] add amp files to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5c4d4348..a7a646ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.zip
+*.amp
 dist
 *.jar

From 8a97d2ebb4afc33fd235cb83c6b2028efaf7a3b2 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 15:09:28 +0200
Subject: [PATCH 09/16] add AOS AMP & wars isntallation instructions

---
 repository/Dockerfile     | 26 ++++++++++++++++----------
 repository/artifacts.json |  8 ++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/repository/Dockerfile b/repository/Dockerfile
index e38afd49..28c0c6a0 100644
--- a/repository/Dockerfile
+++ b/repository/Dockerfile
@@ -8,17 +8,18 @@ FROM tomcat_base AS repo_build
 USER root
 RUN yum install -y unzip
 
-ADD alfresco-content-services-distribution-*.zip /tmp/
+ADD distribution /tmp/
+ENV DISTDIR="/tmp/distribution"
 
-RUN unzip /tmp/alfresco-content-services-distribution-*.zip -d /tmp/distribution
-RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar list /tmp/distribution/web-server/webapps/alfresco.war
+RUN unzip /tmp/*.zip -d ${DISTDIR}
+RUN java -jar ${DISTDIR}/bin/alfresco-mmt.jar list ${DISTDIR}/web-server/webapps/alfresco.war
 RUN mkdir -m 750 -p ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/
 RUN mkdir -m 770 ${CATALINA_HOME}/alf_data/
-RUN unzip /tmp/distribution/web-server/webapps/alfresco.war -d ${CATALINA_HOME}/webapps/alfresco/
-RUN cp -a /tmp/distribution/web-server/conf/* ${CATALINA_HOME}/conf/ && rm -f ${CATALINA_HOME}/conf/Catalina/localhost/share.xml
-RUN cp -a /tmp/distribution/web-server/lib/* ${CATALINA_HOME}/lib/
-RUN cp -a /tmp/distribution/licenses ${CATALINA_HOME}/
-RUN cp -a /tmp/distribution/keystore/metadata-keystore/keystore* ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/
+RUN unzip ${DISTDIR}/web-server/webapps/alfresco.war -d ${CATALINA_HOME}/webapps/alfresco/
+RUN cp -a ${DISTDIR}/web-server/conf/* ${CATALINA_HOME}/conf/ && rm -f ${CATALINA_HOME}/conf/Catalina/localhost/share.xml
+RUN cp -a ${DISTDIR}/web-server/lib/* ${CATALINA_HOME}/lib/
+RUN cp -a ${DISTDIR}/licenses ${CATALINA_HOME}/
+RUN cp -a ${DISTDIR}/keystore/metadata-keystore/keystore* ${CATALINA_HOME}/shared/classes/alfresco/extension/keystore/
 RUN chmod -R o-rwx ${CATALINA_HOME}/
 RUN sed -i 's|shared.loader=|shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar|' \
   ${CATALINA_HOME}/conf/catalina.properties
@@ -29,8 +30,13 @@ RUN sed -i \
   ${CATALINA_HOME}/webapps/alfresco/WEB-INF/classes/log4j2.properties
 
 ADD amps /tmp/amps
-RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar install /tmp/amps/ ${CATALINA_HOME}/webapps/alfresco -nobackup -directory
-RUN java -jar /tmp/distribution/bin/alfresco-mmt.jar list ${CATALINA_HOME}/webapps/alfresco
+RUN if [ -f /tmp/amps/alfresco-aos-module-*.amp ]; then umask 0027; \
+     unzip ${DISTDIR}/web-server/webapps/ROOT.war -d ${CATALINA_HOME}/webapps/ROOT/; \
+     unzip ${DISTDIR}/web-server/webapps/_vti_bin.war -d ${CATALINA_HOME}/webapps/_vti_bin/; \
+   else echo "No AOS module found"; \
+   fi
+RUN java -jar ${DISTDIR}/bin/alfresco-mmt.jar install /tmp/amps/ ${CATALINA_HOME}/webapps/alfresco -nobackup -directory
+RUN java -jar ${DISTDIR}/bin/alfresco-mmt.jar list ${CATALINA_HOME}/webapps/alfresco
 
 FROM tomcat_base AS repo-rhlike
 ARG ALFRESCO_REPO_USER_ID
diff --git a/repository/artifacts.json b/repository/artifacts.json
index bcd0b9d9..e97f526c 100644
--- a/repository/artifacts.json
+++ b/repository/artifacts.json
@@ -9,6 +9,14 @@
         "group": "org.alfresco",
         "repository": "releases"
       },
+      {
+        "name": "alfresco-aos-module",
+        "version": "3.0.0",
+        "path": "repository/amps",
+        "classifier": ".amp",
+        "group": "org.alfresco.aos-module",
+        "repository": "releases"
+      },
       {
         "name": "alfresco-device-sync-repo",
         "version": "5.0.0",

From 745209334ced6d1d224fd893a6c6f3f566d860c6 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 15:14:55 +0200
Subject: [PATCH 10/16] update AMP doc

---
 repository/amps/README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/repository/amps/README.md b/repository/amps/README.md
index 77f40888..bd6a1be4 100644
--- a/repository/amps/README.md
+++ b/repository/amps/README.md
@@ -16,3 +16,15 @@ way to build well structured AMPs.
 > use the [out-of-process Alfresco
 > SDK](https://docs.alfresco.com/content-services/latest/develop/oop-sdk/) to
 > build Docker images with your extensions.
+
+By default the `scripts/fetch-amps.sh` script will fetch the following AMPs from the Alfresco Nexus repository:
+
+* alfresco-share-services
+* alfresco-aos-module
+* alfresco-device-sync-repo
+* alfresco-googledrive-repo-enterprise
+* alfresco-content-services-distribution
+
+You can replace those, remove them to keep only the ones you need or add more.
+Be careful though as some AMPs may depend on one another (e.g.
+`googldrive-repo` depends on `alfresco-share-services`).

From 0e05f71061608d5f507e2a4822874b5c8c2bcf62 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 15:18:58 +0200
Subject: [PATCH 11/16] test produced repo image

---
 docker-compose/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 769326c6..5de6c940 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:23.2.2
+    image: alfresco-content-repository:latest
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-

From e62b05f7186b49106cd8746a584d4a1b0c99d302 Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 18:18:43 +0200
Subject: [PATCH 12/16] add missing ROOT context

---
 repository/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/repository/Dockerfile b/repository/Dockerfile
index 28c0c6a0..b3c4d049 100644
--- a/repository/Dockerfile
+++ b/repository/Dockerfile
@@ -32,6 +32,7 @@ RUN sed -i \
 ADD amps /tmp/amps
 RUN if [ -f /tmp/amps/alfresco-aos-module-*.amp ]; then umask 0027; \
      unzip ${DISTDIR}/web-server/webapps/ROOT.war -d ${CATALINA_HOME}/webapps/ROOT/; \
+     cp ${CATALINA_HOME}/webapps/ROOT/META-INF/context.xml ${CATALINA_HOME}/conf/Catalina/localhost/ROOT.xml; \
      unzip ${DISTDIR}/web-server/webapps/_vti_bin.war -d ${CATALINA_HOME}/webapps/_vti_bin/; \
    else echo "No AOS module found"; \
    fi

From 7ee28e278fad5d89abe781026e532660ae652dbd Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 18:33:22 +0200
Subject: [PATCH 13/16] test produced repo image in all compose files

---
 docker-compose/docker-compose-components.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/docker-compose-components.yml b/docker-compose/docker-compose-components.yml
index 45ea9bdf..8ea8217b 100644
--- a/docker-compose/docker-compose-components.yml
+++ b/docker-compose/docker-compose-components.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   alfresco:
-    image: quay.io/alfresco/alfresco-content-repository:23.2.2
+    image: alfresco-content-repository:latest
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-

From ff64c64e3b956788b52732af42f883edfbfd972d Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 18:42:11 +0200
Subject: [PATCH 14/16] set repository for trouter

---
 ats/trouter/artifacts.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ats/trouter/artifacts.json b/ats/trouter/artifacts.json
index 6b732a0a..01d30a88 100644
--- a/ats/trouter/artifacts.json
+++ b/ats/trouter/artifacts.json
@@ -6,6 +6,7 @@
         "version": "4.1.3",
         "path": "ats/trouter",
         "classifier": ".jar",
+        "repository": "enterprise-releases",
         "group": "org.alfresco"
       }
     ]

From 62da631b29458b38698b22060716e56f3c7fd1be Mon Sep 17 00:00:00 2001
From: Alexandre Chapellon <alexandre.chapellon@hyland.com>
Date: Thu, 25 Jul 2024 18:44:06 +0200
Subject: [PATCH 15/16] add localhost/ prefix in compose file images

---
 docker-compose/docker-compose-components.yml | 2 +-
 docker-compose/docker-compose.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose/docker-compose-components.yml b/docker-compose/docker-compose-components.yml
index 8ea8217b..39f343ec 100644
--- a/docker-compose/docker-compose-components.yml
+++ b/docker-compose/docker-compose-components.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   alfresco:
-    image: alfresco-content-repository:latest
+    image: localhost/alfresco-content-repository:latest
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 5de6c940..7cd4eee5 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   alfresco:
-    image: alfresco-content-repository:latest
+    image: localhost/alfresco-content-repository:latest
     mem_limit: 1900m
     environment:
       JAVA_TOOL_OPTIONS: >-

From bf2cd34f9f32257a5bde0d42a2ff5357428967de Mon Sep 17 00:00:00 2001
From: Alex Chapellon <alxgomz@gmail.com>
Date: Fri, 26 Jul 2024 09:38:34 +0200
Subject: [PATCH 16/16] Update repository/amps/README.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Paweł Maciusiak <158472457+pmacius@users.noreply.github.com>
---
 repository/amps/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/repository/amps/README.md b/repository/amps/README.md
index bd6a1be4..8e3a2b0f 100644
--- a/repository/amps/README.md
+++ b/repository/amps/README.md
@@ -3,7 +3,7 @@
 Place here your Alfresco module Packages (AMPs) to be installed in the Alfresco
 repository.
 
-AMP packages should have the `.amp` extension and stick to he Alfresco module
+AMP packages should have the `.amp` extension and stick to the Alfresco module
 packaging format as described in the [Alfresco
 documentation](https://docs.alfresco.com/content-services/latest/develop/extension-packaging/#alfresco-module-package-amp).