mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-10-08 14:51:49 +00:00
REPO-3061: REPO-3091: Use the separate Share image in docker-compose
This commit is contained in:
Andrei Rebegea
8
docker-alfresco/Dockerfile
Normal file
8
docker-alfresco/Dockerfile
Normal file
@@ -0,0 +1,8 @@
|
||||
FROM docker-internal.alfresco.com/content-services-community:latest
|
||||
|
||||
RUN mkdir -p /usr/local/tomcat/amps
|
||||
|
||||
COPY target/amps /usr/local/tomcat/amps
|
||||
|
||||
RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
|
||||
/usr/local/tomcat/amps /usr/local/tomcat/webapps/alfresco -directory -nobackup -force
|
||||
@@ -1,7 +1,7 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>content-services-community-full-docker</artifactId>
|
||||
<name>ACS Community full Docker image builder</name>
|
||||
<artifactId>content-services-community-full-docker-alfresco</artifactId>
|
||||
<name>ACS Community full Docker image builder for Alfresco</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
@@ -30,24 +30,12 @@
|
||||
<version>${alfresco.aos-module.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>share</artifactId>
|
||||
<version>${alfresco.share.version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledocs-repo</artifactId>
|
||||
<version>${alfresco.googledocs.version}</version>
|
||||
<type>amp</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledocs-share</artifactId>
|
||||
<version>${alfresco.googledocs.version}</version>
|
||||
<type>amp</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
@@ -57,26 +45,6 @@
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>unpack-resources</id>
|
||||
<phase>process-resources</phase>
|
||||
<goals>
|
||||
<goal>unpack</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>share</artifactId>
|
||||
<version>${alfresco.share.version}</version>
|
||||
<type>war</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/war/share</outputDirectory>
|
||||
<destFileName>share.war</destFileName>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>copy-resources</id>
|
||||
<phase>process-resources</phase>
|
||||
@@ -109,14 +77,6 @@
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/amps</outputDirectory>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledocs-share</artifactId>
|
||||
<version>${alfresco.googledocs.version}</version>
|
||||
<type>amp</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/amps_share</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -1 +1,2 @@
|
||||
ALFRESCO_TAG=latest
|
||||
SHARE_TAG=5.2.X
|
||||
|
||||
@@ -18,6 +18,11 @@ services:
|
||||
ports:
|
||||
- 8080:8080 #Browser port
|
||||
|
||||
share:
|
||||
image: full-share:${SHARE_TAG}
|
||||
ports:
|
||||
- 8082:8080
|
||||
|
||||
postgres:
|
||||
image: docker.io/library/postgres:9.4.12
|
||||
environment:
|
||||
|
||||
11
docker-share/Dockerfile
Normal file
11
docker-share/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
||||
FROM quay.io/alfresco/share:5.2.X
|
||||
|
||||
RUN mkdir -p /usr/local/tomcat/amps_share
|
||||
|
||||
COPY target/alfresco-mmt/* /usr/local/tomcat/alfresco-mmt/
|
||||
COPY target/amps_share /usr/local/tomcat/amps_share
|
||||
|
||||
RUN sed -i "s/localhost:8080/alfresco:8080/" /usr/local/tomcat/shared/classes/alfresco/web-extension/share-config-custom.xml
|
||||
|
||||
RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
|
||||
/usr/local/tomcat/amps_share /usr/local/tomcat/webapps/share -directory -nobackup -force
|
||||
68
docker-share/pom.xml
Normal file
68
docker-share/pom.xml
Normal file
@@ -0,0 +1,68 @@
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>content-services-community-full-docker-share</artifactId>
|
||||
<name>ACS Community full Docker image builder for Share</name>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<parent>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>full-community-packaging</artifactId>
|
||||
<version>6.0.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-mmt</artifactId>
|
||||
<version>${dependency.alfresco-mmt.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledocs-share</artifactId>
|
||||
<version>${alfresco.googledocs.version}</version>
|
||||
<type>amp</type>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-dependency-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>copy-resources</id>
|
||||
<phase>process-resources</phase>
|
||||
<goals>
|
||||
<goal>copy</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<artifactItems>
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco</groupId>
|
||||
<artifactId>alfresco-mmt</artifactId>
|
||||
<version>${dependency.alfresco-mmt.version}</version>
|
||||
<type>jar</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/alfresco-mmt</outputDirectory>
|
||||
</artifactItem>
|
||||
<artifactItem>
|
||||
<groupId>org.alfresco.integrations</groupId>
|
||||
<artifactId>alfresco-googledocs-share</artifactId>
|
||||
<version>${alfresco.googledocs.version}</version>
|
||||
<type>amp</type>
|
||||
<overWrite>false</overWrite>
|
||||
<outputDirectory>${project.build.directory}/amps_share</outputDirectory>
|
||||
</artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
|
||||
</build>
|
||||
|
||||
</project>
|
||||
@@ -1,13 +0,0 @@
|
||||
FROM docker-internal.alfresco.com/content-services-community:latest
|
||||
|
||||
RUN mkdir -p /usr/local/tomcat/amps && \
|
||||
mkdir -p /usr/local/tomcat/amps_share
|
||||
|
||||
COPY target/amps /usr/local/tomcat/amps
|
||||
COPY target/amps_share /usr/local/tomcat/amps_share
|
||||
COPY target/war /usr/local/tomcat/webapps
|
||||
|
||||
RUN java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
|
||||
/usr/local/tomcat/amps /usr/local/tomcat/webapps/alfresco -directory -nobackup -force && \
|
||||
java -jar /usr/local/tomcat/alfresco-mmt/alfresco-mmt*.jar install \
|
||||
/usr/local/tomcat/amps_share /usr/local/tomcat/webapps/share -directory -nobackup -force
|
||||
4
pom.xml
4
pom.xml
@@ -42,6 +42,7 @@
|
||||
<installer.imagemagick.version>7.0.5</installer.imagemagick.version>
|
||||
<installer.manager.version>1.0</installer.manager.version>
|
||||
<installer.alfresco-pdf-renderer.version>1.0</installer.alfresco-pdf-renderer.version>
|
||||
<dependency.alfresco-mmt.version>6.0</dependency.alfresco-mmt.version>
|
||||
|
||||
<!-- Install builder version -->
|
||||
<installer.installbuilder.version>15.10.1</installer.installbuilder.version>
|
||||
@@ -56,7 +57,8 @@
|
||||
<module>public-javadoc</module>
|
||||
<module>installer-resources</module>
|
||||
<module>installer</module>
|
||||
<module>docker</module>
|
||||
<module>docker-alfresco</module>
|
||||
<module>docker-share</module>
|
||||
</modules>
|
||||
|
||||
<dependencyManagement>
|
||||
|
||||
Reference in New Issue
Block a user