diff --git a/docker/Dockerfile.repo.build b/docker/Dockerfile.repo.build index 478d4ca..1e39064 100644 --- a/docker/Dockerfile.repo.build +++ b/docker/Dockerfile.repo.build @@ -10,7 +10,7 @@ ARG ACOSIX_UTILS_VERSION WORKDIR /aldica # Copy Acosix dependency to image -RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo:${ACOSIX_UTILS_VERSION}:amp -DoutputDirectory=deps -B +RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo:${ACOSIX_UTILS_VERSION}:jar -DoutputDirectory=deps -B ADD docker/toolchains.xml /root/.m2/ @@ -38,10 +38,7 @@ FROM alfresco/alfresco-content-repository-community:6.2.0-ga ARG ACOSIX_UTILS_VERSION -COPY --from=0 --chown=root:Alfresco /aldica/repository/target/aldica-repo-ignite-*.amp ./amps/ -COPY --from=0 --chown=root:Alfresco /aldica/deps/de.acosix.alfresco.utility.core.repo-${ACOSIX_UTILS_VERSION}.amp ./amps/ +COPY --from=0 --chown=root:Alfresco /aldica/repository/target/aldica-repo-ignite-*.jar ./usr/local/tomcat/webapps/alfresco/WEB-INF/lib/ +COPY --from=0 --chown=root:Alfresco /aldica/deps/de.acosix.alfresco.utility.core.repo-${ACOSIX_UTILS_VERSION}.jar /usr/local/tomcat/webapps/alfresco/WEB-INF/lib/ -USER root -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install ./amps/de.acosix.alfresco.utility.core.repo-${ACOSIX_UTILS_VERSION}.amp webapps/alfresco -nobackup -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install ./amps/aldica-repo-ignite-*.amp webapps/alfresco -nobackup USER alfresco diff --git a/docker/Dockerfile.repo.download b/docker/Dockerfile.repo.download index 628055d..3ca043b 100644 --- a/docker/Dockerfile.repo.download +++ b/docker/Dockerfile.repo.download @@ -6,20 +6,16 @@ FROM maven:3-jdk-11 ARG ACOSIX_UTILS_VERSION -RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo:${ACOSIX_UTILS_VERSION}:amp -DoutputDirectory=/tmp -B -RUN mvn dependency:copy -Dartifact=org.aldica:aldica-repo-ignite:1.0.1:amp -DoutputDirectory=/tmp -B +RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo:${ACOSIX_UTILS_VERSION}:jar -DoutputDirectory=/tmp -B +RUN mvn dependency:copy -Dartifact=org.aldica:aldica-repo-ignite:1.0.1:jar -DoutputDirectory=/tmp -B # Build aldica-enabled Alfresco Repository FROM alfresco/alfresco-content-repository-community:6.2.0-ga ARG ACOSIX_UTILS_VERSION -COPY --from=0 --chown=root:Alfresco /tmp/aldica-repo-ignite-1.0.1.amp . -COPY --from=0 --chown=root:Alfresco /tmp/de.acosix.alfresco.utility.core.repo-${ACOSIX_UTILS_VERSION}.amp . +COPY --from=0 --chown=root:Alfresco /tmp/aldica-repo-ignite-1.0.1.jar /usr/local/tomcat/webapps/alfresco/WEB-INF/lib/ +COPY --from=0 --chown=root:Alfresco /tmp/de.acosix.alfresco.utility.core.repo-${ACOSIX_UTILS_VERSION}.jar /usr/local/tomcat/webapps/alfresco/WEB-INF/lib/ -USER root - -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install de.acosix.alfresco.utility.core.repo-${ACOSIX_UTILS_VERSION}.amp webapps/alfresco -nobackup -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install aldica-repo-ignite-1.0.1.amp webapps/alfresco -nobackup USER alfresco diff --git a/docker/Dockerfile.share.build b/docker/Dockerfile.share.build index 957273b..c51fab4 100644 --- a/docker/Dockerfile.share.build +++ b/docker/Dockerfile.share.build @@ -10,7 +10,7 @@ ARG ACOSIX_UTILS_VERSION WORKDIR /aldica # Copy Acosix dependency to image -RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.share:${ACOSIX_UTILS_VERSION}:amp -DoutputDirectory=deps -B +RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.share:${ACOSIX_UTILS_VERSION}:jar -DoutputDirectory=deps -B ADD docker/toolchains.xml /root/.m2/ @@ -37,8 +37,5 @@ FROM alfresco/alfresco-share:6.2.0 ARG ACOSIX_UTILS_VERSION -COPY --from=0 /aldica/share/target/aldica-share-ignite-*.amp ./amps_share/ -COPY --from=0 /aldica/deps/de.acosix.alfresco.utility.core.share-${ACOSIX_UTILS_VERSION}.amp ./amps_share/ - -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install ./amps_share/de.acosix.alfresco.utility.core.share-${ACOSIX_UTILS_VERSION}.amp webapps/share -force -nobackup -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install ./amps_share/aldica-share-ignite-*.amp webapps/share -nobackup +COPY --from=0 /aldica/share/target/aldica-share-ignite-*.jar /usr/local/tomcat/webapps/share/WEB-INF/lib/ +COPY --from=0 /aldica/deps/de.acosix.alfresco.utility.core.share-${ACOSIX_UTILS_VERSION}.jar /usr/local/tomcat/webapps/share/WEB-INF/lib/ diff --git a/docker/Dockerfile.share.download b/docker/Dockerfile.share.download index ca192e2..9ced17b 100644 --- a/docker/Dockerfile.share.download +++ b/docker/Dockerfile.share.download @@ -6,8 +6,8 @@ FROM maven:3-jdk-11 ARG ACOSIX_UTILS_VERSION -RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.share:${ACOSIX_UTILS_VERSION}:amp -DoutputDirectory=/tmp -B -RUN mvn dependency:copy -Dartifact=org.aldica:aldica-share-ignite:1.0.1:amp -DoutputDirectory=/tmp -B +RUN mvn dependency:copy -Dartifact=de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.share:${ACOSIX_UTILS_VERSION}:jar -DoutputDirectory=/tmp -B +RUN mvn dependency:copy -Dartifact=org.aldica:aldica-share-ignite:1.0.1:jar -DoutputDirectory=/tmp -B # Build aldica-enabled Alfresco Share FROM alfresco/alfresco-share:6.2.0 @@ -17,8 +17,5 @@ ARG ACOSIX_UTILS_VERSION # Disable CSRF filter (do not use this in production) COPY docker/share-config-custom-dev.xml /usr/local/tomcat/shared/classes/alfresco/web-extension/share-config-custom-dev.xml -COPY --from=0 /tmp/aldica-share-ignite-1.0.1.amp . -COPY --from=0 /tmp/de.acosix.alfresco.utility.core.share-${ACOSIX_UTILS_VERSION}.amp . - -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install de.acosix.alfresco.utility.core.share-${ACOSIX_UTILS_VERSION}.amp webapps/share -force -nobackup -RUN java -jar alfresco-mmt/alfresco-mmt-6.0.jar install aldica-share-ignite-1.0.1.amp webapps/share -nobackup +COPY --from=0 /tmp/aldica-share-ignite-1.0.1.jar /usr/local/tomcat/webapps/share/WEB-INF/lib/ +COPY --from=0 /tmp/de.acosix.alfresco.utility.core.share-${ACOSIX_UTILS_VERSION}.jar /usr/local/tomcat/webapps/share/WEB-INF/lib/