From 4650110b96a5941e565e6572a4f816a08c227e92 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 21 Dec 2020 14:28:20 -0500 Subject: [PATCH 1/7] fixed COPY for multiple AMPs --- alfresco-content-repository/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfresco-content-repository/docker/Dockerfile b/alfresco-content-repository/docker/Dockerfile index fdc4bab..a086f23 100644 --- a/alfresco-content-repository/docker/Dockerfile +++ b/alfresco-content-repository/docker/Dockerfile @@ -5,7 +5,7 @@ ARG TOMCAT_DIR=/usr/local/tomcat USER root -COPY *.amp ${TOMCAT_DIR}/amps +COPY *.amp ${TOMCAT_DIR}/amps/ RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory From 8a29bded243e67f4cdc965786e42823f3c2cf11b Mon Sep 17 00:00:00 2001 From: Brian Long Date: Mon, 21 Dec 2020 14:29:05 -0500 Subject: [PATCH 2/7] fixed COPY for multiple files --- alfresco-share/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfresco-share/docker/Dockerfile b/alfresco-share/docker/Dockerfile index 177661b..c626b5e 100644 --- a/alfresco-share/docker/Dockerfile +++ b/alfresco-share/docker/Dockerfile @@ -2,6 +2,6 @@ FROM alfresco/alfresco-share:latest ARG TOMCAT_DIR=/usr/local/tomcat -COPY *.amp ${TOMCAT_DIR}/amps_share +COPY *.amp ${TOMCAT_DIR}/amps_share/ RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory From a30f423c4490ea4a35f99d871adbd62621a79a3b Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 25 Dec 2020 14:32:20 -0500 Subject: [PATCH 3/7] enabled JAR extension loading --- alfresco-content-repository/docker/Dockerfile | 3 ++- docker-compose.yml | 2 +- tomcat-platform-context.xml | 7 +++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tomcat-platform-context.xml diff --git a/alfresco-content-repository/docker/Dockerfile b/alfresco-content-repository/docker/Dockerfile index a086f23..082420d 100644 --- a/alfresco-content-repository/docker/Dockerfile +++ b/alfresco-content-repository/docker/Dockerfile @@ -7,6 +7,7 @@ USER root COPY *.amp ${TOMCAT_DIR}/amps/ -RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \ + mkdir -p ${TOMCAT_DIR}/modules USER ${USERNAME} diff --git a/docker-compose.yml b/docker-compose.yml index 44ae54d..a35e477 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: - postgres-acs - activemq volumes: - - "./alfresco-content-repository/modules:/usr/local/tomcat/modules/platform:ro" + - "./alfresco-content-repository/modules:/usr/local/tomcat/modules:ro" postgres-acs: image: postgres:latest diff --git a/tomcat-platform-context.xml b/tomcat-platform-context.xml new file mode 100644 index 0000000..d373c25 --- /dev/null +++ b/tomcat-platform-context.xml @@ -0,0 +1,7 @@ + + + + + + + From 18839c8019d966ec1e0158b81871fc1738162791 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 25 Dec 2020 14:39:01 -0500 Subject: [PATCH 4/7] enabled JAR extension loading --- alfresco-share/docker/Dockerfile | 4 +++- docker-compose.yml | 3 ++- tomcat-share-context.xml | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 tomcat-share-context.xml diff --git a/alfresco-share/docker/Dockerfile b/alfresco-share/docker/Dockerfile index c626b5e..a794835 100644 --- a/alfresco-share/docker/Dockerfile +++ b/alfresco-share/docker/Dockerfile @@ -4,4 +4,6 @@ ARG TOMCAT_DIR=/usr/local/tomcat COPY *.amp ${TOMCAT_DIR}/amps_share/ -RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory +RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \ + mkdir -p ${TOMCAT_DIR}/modules + diff --git a/docker-compose.yml b/docker-compose.yml index 859f201..d788106 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,8 @@ services: environment: REPO_HOST: "platform" volumes: - - "./alfresco-share/modules:/usr/local/tomcat/modules/share:ro" + - "./tomcat-share-context.xml:/usr/local/tomcat/conf/Catalina/localhost/share.xml:ro" + - "./alfresco-share/modules:/usr/local/tomcat/modules:ro" postgres-acs: image: postgres:latest diff --git a/tomcat-share-context.xml b/tomcat-share-context.xml new file mode 100644 index 0000000..d373c25 --- /dev/null +++ b/tomcat-share-context.xml @@ -0,0 +1,7 @@ + + + + + + + From 119c6643bd103d96516f0c980e7b0269f58a9461 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 25 Dec 2020 14:41:51 -0500 Subject: [PATCH 5/7] refactored JAR ext loading --- alfresco-content-repository/docker/Dockerfile | 1 + .../docker/tomcat-platform-context.xml | 0 2 files changed, 1 insertion(+) rename tomcat-platform-context.xml => alfresco-content-repository/docker/tomcat-platform-context.xml (100%) diff --git a/alfresco-content-repository/docker/Dockerfile b/alfresco-content-repository/docker/Dockerfile index 082420d..91f844e 100644 --- a/alfresco-content-repository/docker/Dockerfile +++ b/alfresco-content-repository/docker/Dockerfile @@ -5,6 +5,7 @@ ARG TOMCAT_DIR=/usr/local/tomcat USER root +COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml COPY *.amp ${TOMCAT_DIR}/amps/ RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \ diff --git a/tomcat-platform-context.xml b/alfresco-content-repository/docker/tomcat-platform-context.xml similarity index 100% rename from tomcat-platform-context.xml rename to alfresco-content-repository/docker/tomcat-platform-context.xml From b9f05970205731761455268cf667f6939afd9c94 Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 25 Dec 2020 14:44:51 -0500 Subject: [PATCH 6/7] refactored JAR ext loading --- alfresco-share/docker/Dockerfile | 1 + .../docker/tomcat-share-context.xml | 0 docker-compose.yml | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename tomcat-share-context.xml => alfresco-share/docker/tomcat-share-context.xml (100%) diff --git a/alfresco-share/docker/Dockerfile b/alfresco-share/docker/Dockerfile index a794835..be5ccd5 100644 --- a/alfresco-share/docker/Dockerfile +++ b/alfresco-share/docker/Dockerfile @@ -2,6 +2,7 @@ FROM alfresco/alfresco-share:latest ARG TOMCAT_DIR=/usr/local/tomcat +COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml COPY *.amp ${TOMCAT_DIR}/amps_share/ RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps_share ${TOMCAT_DIR}/webapps/share -nobackup -directory && \ diff --git a/tomcat-share-context.xml b/alfresco-share/docker/tomcat-share-context.xml similarity index 100% rename from tomcat-share-context.xml rename to alfresco-share/docker/tomcat-share-context.xml diff --git a/docker-compose.yml b/docker-compose.yml index d788106..0a26122 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,7 +21,6 @@ services: environment: REPO_HOST: "platform" volumes: - - "./tomcat-share-context.xml:/usr/local/tomcat/conf/Catalina/localhost/share.xml:ro" - "./alfresco-share/modules:/usr/local/tomcat/modules:ro" postgres-acs: From 32b8e047fb974effe0268339eba85ba777d6010f Mon Sep 17 00:00:00 2001 From: Brian Long Date: Fri, 25 Dec 2020 15:16:36 -0500 Subject: [PATCH 7/7] appending catalina.policy file for these external JARs --- alfresco-content-repository/docker/Dockerfile | 4 +++- alfresco-content-repository/docker/catalina.policy | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 alfresco-content-repository/docker/catalina.policy diff --git a/alfresco-content-repository/docker/Dockerfile b/alfresco-content-repository/docker/Dockerfile index 91f844e..5043aec 100644 --- a/alfresco-content-repository/docker/Dockerfile +++ b/alfresco-content-repository/docker/Dockerfile @@ -5,10 +5,12 @@ ARG TOMCAT_DIR=/usr/local/tomcat USER root +COPY catalina.policy /tmp/catalina.policy.ext COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco.xml COPY *.amp ${TOMCAT_DIR}/amps/ RUN java -jar ${TOMCAT_DIR}/alfresco-mmt/alfresco-mmt*.jar install ${TOMCAT_DIR}/amps ${TOMCAT_DIR}/webapps/alfresco -nobackup -directory && \ - mkdir -p ${TOMCAT_DIR}/modules + mkdir -p ${TOMCAT_DIR}/modules && \ + cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy USER ${USERNAME} diff --git a/alfresco-content-repository/docker/catalina.policy b/alfresco-content-repository/docker/catalina.policy new file mode 100644 index 0000000..271c13e --- /dev/null +++ b/alfresco-content-repository/docker/catalina.policy @@ -0,0 +1,4 @@ +grant codeBase "file:${catalina.base}/modules/-" { + permission java.security.AllPermission; +}; +