You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2017/11/21 13:27:35 UTC
wicket git commit: Use custom Dockerfile for creating the image with
the examples
Repository: wicket
Updated Branches:
refs/heads/master 196c33c8b -> e4ea6d7b4
Use custom Dockerfile for creating the image with the examples
Removes the default applications in Tomcat8.5 image and adds wicket-examples as ROOT.war so that it is at the root context path
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e4ea6d7b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e4ea6d7b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e4ea6d7b
Branch: refs/heads/master
Commit: e4ea6d7b488f04948fd50b69e06da2d231e3b5ba
Parents: 196c33c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Nov 21 15:20:42 2017 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Nov 21 15:27:29 2017 +0200
----------------------------------------------------------------------
wicket-examples/Dockerfile | 6 ++++++
wicket-examples/pom.xml | 38 +++++++++++++++++++++-----------------
2 files changed, 27 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e4ea6d7b/wicket-examples/Dockerfile
----------------------------------------------------------------------
diff --git a/wicket-examples/Dockerfile b/wicket-examples/Dockerfile
new file mode 100644
index 0000000..e51f6f8
--- /dev/null
+++ b/wicket-examples/Dockerfile
@@ -0,0 +1,6 @@
+FROM tomcat:8.5-jre8-alpine
+MAINTAINER Apache Wicket Team <de...@wicket.apache.org>
+
+RUN rm -rf /usr/local/tomcat/webapps/*
+
+ADD target/ROOT.war /usr/local/tomcat/webapps/
http://git-wip-us.apache.org/repos/asf/wicket/blob/e4ea6d7b/wicket-examples/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml
index 20e6f47..25328bd 100644
--- a/wicket-examples/pom.xml
+++ b/wicket-examples/pom.xml
@@ -32,7 +32,7 @@
</description>
<properties>
- <docker-maven-plugin.version>1.0.0</docker-maven-plugin.version>
+ <dockerfile-maven-plugin.version>1.3.6</dockerfile-maven-plugin.version>
</properties>
<dependencyManagement>
@@ -287,28 +287,32 @@
<profile>
<id>docker</id>
<properties>
- <pushImage/>
+ <warName>ROOT</warName>
</properties>
<build>
+ <finalName>${warName}</finalName>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warName>${warName}</warName>
+ <!-- include the manifest entries so that we can emit the version of the examples. -->
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>com.spotify</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>${docker-maven-plugin.version}</version>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <version>${dockerfile-maven-plugin.version}</version>
<configuration>
- <imageName>apache-docker-wicket-docker.bintray.io/wicket-examples:LATEST-8</imageName>
- <baseImage>tomcat:8.5-jre8-alpine</baseImage>
- <resources>
- <resource>
- <targetPath>/usr/local/tomcat/webapps</targetPath>
- <directory>${project.build.directory}</directory>
- <include>wicket-examples.war</include>
- </resource>
- </resources>
- <forceTags>true</forceTags>
- <imageTags>
- <imageTag>LATEST-8</imageTag>
- </imageTags>
+ <repository>apache-docker-wicket-docker.bintray.io/wicket-examples</repository>
+ <tag>LATEST-8</tag>
</configuration>
<executions>
<execution>