Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/issue 24 use jar files #66

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/issue 24 use jar files #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
289cd86
1 - Changed the Dockerfile.repo.download to install the jar files ins…
DarkStar1 Aug 5, 2021
c73b712
1 - Made changes for share to also use the jar dependencies instead o…
DarkStar1 Aug 5, 2021
014f5e4
1 - Changed the *.build files to use the jar instead of amps
DarkStar1 Aug 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions docker/Dockerfile.repo.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down Expand Up @@ -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
12 changes: 4 additions & 8 deletions docker/Dockerfile.repo.download
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 3 additions & 6 deletions docker/Dockerfile.share.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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/
11 changes: 4 additions & 7 deletions docker/Dockerfile.share.download
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/