Skip to content

Commit

Permalink
[resolves #796] Docker maven module versions not updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesnetherton
jamesnetherton committed Aug 5, 2015
1 parent 80a04ee commit ee77f45
Show file tree
Hide file tree
Showing 5 changed files with 295 additions and 285 deletions.
162 changes: 87 additions & 75 deletions docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>org.wildfly.camel</groupId>
<artifactId>wildfly-camel</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>
</parent>

<name>Wildfly Camel :: Docker</name>
Expand Down Expand Up @@ -54,78 +54,90 @@
<type>tar.gz</type>
</dependency>
</dependencies>

<!-- Build -->
<build>
<plugins>
<plugin>
<groupId>org.jolokia</groupId>
<artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>remove-images</id>
<phase>clean</phase>
<goals>
<goal>remove</goal>
</goals>
<configuration>
<images>
<image>
<name>${docker.image.name}:${docker.image.version}</name>
</image>
<image>
<name>${docker.image.name}:${project.version}</name>
</image>
</images>
</configuration>
</execution>
<execution>
<id>build-docker-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
<configuration>
<images>
<image>
<name>${docker.image.name}</name>
<build>
<maintainer>${docker.image.maintainer}</maintainer>
<from>${docker.image.from}</from>
<cmd>
<exec>
<args>-c</args>
<args>${server.config}</args>
<args>-b</args>
<args>0.0.0.0</args>
<args>-bmanagement</args>
<args>0.0.0.0</args>
</exec>
</cmd>
<entryPoint>
<exec>
<args>/opt/jboss/wildfly/bin/entrypoint.sh</args>
</exec>
</entryPoint>
<ports>
<port>9999</port>
</ports>
<tags>
<tag>${docker.image.version}</tag>
<tag>${project.version}</tag>
</tags>
<assembly>
<basedir>/opt/jboss/wildfly</basedir>
<descriptor>${project.basedir}/scripts/assembly-artifacts.xml</descriptor>
<user>jboss:jboss:jboss</user>
</assembly>
</build>
</image>
</images>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<!-- Profiles -->
<profiles>
<profile>
<!-- Requires DOCKER_HOST -->
<id>docker</id>
<activation>
<property>
<name>docker</name>
</property>
</activation>

<build>
<plugins>
<plugin>
<groupId>org.jolokia</groupId>
<artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<id>remove-images</id>
<phase>clean</phase>
<goals>
<goal>remove</goal>
</goals>
<configuration>
<images>
<image>
<name>${docker.image.name}:${docker.image.version}</name>
</image>
<image>
<name>${docker.image.name}:${project.version}</name>
</image>
</images>
</configuration>
</execution>
<execution>
<id>build-docker-image</id>
<phase>install</phase>
<goals>
<goal>build</goal>
</goals>
<configuration>
<images>
<image>
<name>${docker.image.name}</name>
<build>
<maintainer>${docker.image.maintainer}</maintainer>
<from>${docker.image.from}</from>
<cmd>
<exec>
<args>-c</args>
<args>${server.config}</args>
<args>-b</args>
<args>0.0.0.0</args>
<args>-bmanagement</args>
<args>0.0.0.0</args>
</exec>
</cmd>
<entryPoint>
<exec>
<args>/opt/jboss/wildfly/bin/entrypoint.sh</args>
</exec>
</entryPoint>
<ports>
<port>9999</port>
</ports>
<tags>
<tag>${docker.image.version}</tag>
<tag>${project.version}</tag>
</tags>
<assembly>
<basedir>/opt/jboss/wildfly</basedir>
<descriptor>${project.basedir}/scripts/assembly-artifacts.xml</descriptor>
<user>jboss:jboss:jboss</user>
</assembly>
</build>
</image>
</images>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Loading

0 comments on commit ee77f45

Please sign in to comment.