Commit 52d8f701 authored by Brian Long's avatar Brian Long
Browse files

fixed ACS docker builds

parent da7d9e3c

beedk-acs-platform-webapp-docker-tile/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ COPY tomcat-platform-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/alfresco. 
RUN mkdir -p ${TOMCAT_DIR}/modules/platform && \

        cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy



COPY ${project.build.warFile} ${TOMCAT_DIR}/webapps/alfresco.war

COPY modules/*.jar ${TOMCAT_DIR}/modules/platform/

COPY war/${alfresco.war.artifactId}-${alfresco.war.version}.war ${TOMCAT_DIR}/webapps/alfresco.war

COPY ext/platform/*.jar ${TOMCAT_DIR}/modules/platform/



USER ${USERNAME}

beedk-acs-share-webapp-docker-tile/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ COPY tomcat-share-context.xml ${TOMCAT_DIR}/conf/Catalina/localhost/share.xml 
RUN mkdir -p ${TOMCAT_DIR}/modules/share && \

        cat /tmp/catalina.policy.ext >> ${TOMCAT_DIR}/conf/catalina.policy



COPY ${project.build.warFile} ${TOMCAT_DIR}/webapps/share.war

COPY modules/*.jar ${TOMCAT_DIR}/modules/share/

COPY war/${alfresco.war.artifactId}-${alfresco.war.version}.war ${TOMCAT_DIR}/webapps/share.war

COPY ext/share/*.jar ${TOMCAT_DIR}/modules/share/



USER ${USERNAME}

beedk-acs-share-webapp-tile/tile.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
			<properties>

				<!-- configuring beedk-acs-webapp-artifact-tile -->

				<alfresco.war.artifactId>share</alfresco.war.artifactId>

				<alfresco.war.version>${alfresco.platform.version}</alfresco.war.version>

				<alfresco.war.version>${alfresco.share.version}</alfresco.war.version>

			</properties>

		</profile>

	</profiles>

beedk-acs-webapp-docker-tile/tile.xml

+23 −2
Original line number Diff line number Diff line
@@ -30,6 +30,24 @@ 
					</execution>

				</executions>

			</plugin>

			<!-- This plugin downloads the Platform JAR-based extension modules and runtime/test dependencies -->

			<plugin>

				<artifactId>maven-dependency-plugin</artifactId>

				<version>3.1.2</version>

				<executions>

					<!-- This execution downloads the dependency JARs, including JAR modules -->

					<execution>

						<id>download-jars</id>

						<phase>prepare-package</phase>

						<goals><goal>copy-dependencies</goal></goals>

						<configuration>

							<excludeScope>provided</excludeScope>

							<includeTypes>jar</includeTypes>

							<outputDirectory>${project.build.extDirectory}</outputDirectory>

						</configuration>

					</execution>

				</executions>

			</plugin>

			<!-- This plugin configures the building and pushing of a Docker image -->

			<plugin>

				<groupId>com.spotify</groupId>
@@ -74,11 +92,14 @@ 
				</property>

			</activation>

			<properties>

				<!-- configurable -->

				<project.build.extDirectory>${project.build.directory}/ext/platform</project.build.extDirectory>

				<docker.source.directory>${basedir}/src/main/docker</docker.source.directory>

				<docker.image.tag>${project.version}</docker.image.tag>

				

				<!-- skip deployment of spring boot app -->

				<beedk.deploy.dockerImageOnly>true</beedk.deploy.dockerImageOnly>

				<maven.deploy.skip>${beedk.deploy.dockerImageOnly}</maven.deploy.skip>

				<docker.source.directory>${basedir}/src/main/docker</docker.source.directory>

				<docker.image.tag>${project.version}</docker.image.tag>

			</properties>

		</profile>

	</profiles>