Merge branch 'feature/REPO-3378_release_docker_images' into 'master'

Merge Feature/repo_3378_release_docker_images into master

See merge request Repository/alfresco-docker-transformers!2
This commit is contained in:
Alexandru Epure 2018-04-10 14:09:21 +01:00
commit abd9222824
5 changed files with 133 additions and 43 deletions

View File

@ -4,19 +4,18 @@
<name>Alfresco Docker Pdf Renderer</name>
<packaging>jar</packaging>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-docker-transformers</artifactId>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<image.name>alfresco/${project.artifactId}</image.name>
<image.name>alfresco/alfresco-pdf-renderer</image.name>
<image.registry>quay.io</image.registry>
<public.image.registry>registry.hub.docker.com</public.image.registry>
</properties>
<dependencyManagement>
@ -77,7 +76,6 @@
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
@ -123,12 +121,48 @@
<configuration>
<images>
<image>
<name>alfresco/${project.artifactId}</name>
<name>${image.registry}/${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>master</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<name>${image.registry}/${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<tags>
<tag>${project.version}</tag>
</tags>
</build>
</image>
</images>
@ -165,16 +199,12 @@
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<!-- This project is for enterprise use only, it will be pushed only to quay.io
Added the image push to dockerhub for a possible future use
<image>
<name>${image.name}:${project.version}</name>
<registry>${public.image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
-->
</images>
</configuration>
<executions>

View File

@ -4,19 +4,18 @@
<name>Alfresco Docker ImageMagick</name>
<packaging>jar</packaging>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-docker-transformers</artifactId>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<image.name>alfresco/${project.artifactId}</image.name>
<image.name>alfresco/alfresco-imagemagick</image.name>
<image.registry>quay.io</image.registry>
<public.image.registry>registry.hub.docker.com</public.image.registry>
</properties>
<dependencyManagement>
@ -77,7 +76,6 @@
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
@ -123,12 +121,48 @@
<configuration>
<images>
<image>
<name>alfresco/${project.artifactId}</name>
<name>${image.registry}/${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>master</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<name>${image.registry}/${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<tags>
<tag>${project.version}</tag>
</tags>
</build>
</image>
</images>
@ -165,16 +199,12 @@
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<!-- This project is for enterprise use only, it will be pushed only to quay.io
Added the image push to dockerhub for a possible future use
<image>
<name>${image.name}:${project.version}</name>
<registry>${public.image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
-->
</images>
</configuration>
<executions>

View File

@ -4,19 +4,18 @@
<name>Alfresco Docker LibreOffice</name>
<packaging>jar</packaging>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-docker-transformers</artifactId>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
<image.name>alfresco/${project.artifactId}</image.name>
<image.name>alfresco/alfresco-libreoffice</image.name>
<image.registry>quay.io</image.registry>
<public.image.registry>registry.hub.docker.com</public.image.registry>
</properties>
<dependencyManagement>
@ -87,7 +86,6 @@
<images>
<image>
<name>${image.name}:${image.tag}</name>
<registry>${image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
@ -133,12 +131,48 @@
<configuration>
<images>
<image>
<name>alfresco/${project.artifactId}</name>
<name>${image.registry}/${image.name}:${image.tag}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
</images>
</configuration>
<executions>
<execution>
<id>build-push-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
<goal>push</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>master</id>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>fabric8-maven-plugin</artifactId>
<version>${dependency.fabric8.version}</version>
<configuration>
<images>
<image>
<name>${image.registry}/${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<image>
<name>${image.name}</name>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
<tags>
<tag>${project.version}</tag>
</tags>
</build>
</image>
</images>
@ -175,16 +209,12 @@
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
<!-- This project is for enterprise use only, it will be pushed only to quay.io
Added the image push to dockerhub for a possible future use
<image>
<name>${image.name}:${project.version}</name>
<registry>${public.image.registry}</registry>
<build>
<dockerFileDir>${project.basedir}/</dockerFileDir>
</build>
</image>
-->
</images>
</configuration>
<executions>

View File

@ -4,13 +4,13 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-docker-transformers</artifactId>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-transformer-base</artifactId>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<dependencyManagement>
<dependencies>

View File

@ -10,7 +10,7 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-docker-transformers</artifactId>
<version>0.4-SNAPSHOT</version>
<version>0.8-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@ -41,7 +41,7 @@
<distributionManagement>
<repository>
<id>alfresco-internal</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases</url>
<url>https://artifacts.alfresco.com/nexus/content/repositories/internal-releases</url>
</repository>
<snapshotRepository>
<id>alfresco-internal-snapshots</id>