You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/09/14 14:30:10 UTC
[isis] branch master updated: ISIS-2427: vaadin demo: add docker
image profile
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 11f6edf ISIS-2427: vaadin demo: add docker image profile
11f6edf is described below
commit 11f6edf1e78c70a5e6dc71de124a540177a74744
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Sep 14 16:29:52 2020 +0200
ISIS-2427: vaadin demo: add docker image profile
also cleanup wicket demo profiles (remove legacy)
---
examples/demo/vaadin/pom.xml | 62 ++++++++++++++++++++--
examples/demo/wicket/pom.xml | 121 ++-----------------------------------------
2 files changed, 63 insertions(+), 120 deletions(-)
diff --git a/examples/demo/vaadin/pom.xml b/examples/demo/vaadin/pom.xml
index a69386d..15418ee 100644
--- a/examples/demo/vaadin/pom.xml
+++ b/examples/demo/vaadin/pom.xml
@@ -25,11 +25,10 @@
<name>Demo - Vaadin</name>
- <packaging>${packaging.type}</packaging>
+ <packaging>jar</packaging>
<properties>
<sonar.skip>true</sonar.skip>
- <packaging.type>jar</packaging.type>
<maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
@@ -157,11 +156,10 @@
<id>package-as-jar</id>
<activation>
<property>
- <name>!package-as-war</name>
+ <name>!skip-package-as-jar</name>
</property>
</activation>
<properties>
- <packaging.type>jar</packaging.type>
</properties>
<build>
@@ -169,6 +167,14 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <requiresUnpack>
+ <dependency>
+ <groupId>org.asciidoctor</groupId>
+ <artifactId>asciidoctorj</artifactId>
+ </dependency>
+ </requiresUnpack>
+ </configuration>
<executions>
<execution>
<goals>
@@ -180,6 +186,54 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>deploy-to-docker-io</id>
+ <activation>
+ <property>
+ <name>!skip-docker</name>
+ </property>
+ </activation>
+ <properties>
+ <package-as-war>false</package-as-war>
+ </properties>
+ <dependencies>
+ <!-- add flavor specific here -->
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ <configuration>
+ <from>
+ <image>openjdk:13-alpine</image>
+ </from>
+ <container>
+ <jvmFlags>
+ <jvmFlag>-Xmx512m</jvmFlag>
+ </jvmFlags>
+ <mainClass>demoapp.webapp.vaadin.DemoAppVaadin</mainClass>
+ <ports>
+ <port>8080</port>
+ </ports>
+ </container>
+ <to>
+ <image>docker.io/apacheisis/demo-vaadin</image>
+ <tags>
+ <tag>nightly</tag>
+ </tags>
+ <auth>
+ <username>${env.DOCKER_REGISTRY_USERNAME}</username>
+ <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
+ </auth>
+ </to>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
diff --git a/examples/demo/wicket/pom.xml b/examples/demo/wicket/pom.xml
index 04a2f90..241d74e 100644
--- a/examples/demo/wicket/pom.xml
+++ b/examples/demo/wicket/pom.xml
@@ -25,17 +25,13 @@
<name>Demo - Wicket</name>
- <packaging>${packaging.type}</packaging>
+ <packaging>jar</packaging>
<properties>
<sonar.skip>true</sonar.skip>
- <packaging.type>jar</packaging.type>
<maven-war-plugin.warName>${project.artifactId}</maven-war-plugin.warName>
- <!-- this can be overridden using -Dflavor=... -->
- <flavor>springboot</flavor>
-
</properties>
<build>
@@ -107,7 +103,7 @@
<id>package-as-jar</id>
<activation>
<property>
- <name>!package-as-war</name>
+ <name>!skip-package-as-jar</name>
</property>
</activation>
<properties>
@@ -141,15 +137,13 @@
<profile>
- <id>flavor-springboot</id>
+ <id>deploy-to-docker-io</id>
<activation>
<property>
- <name>flavor</name>
- <value>springboot</value>
+ <name>!skip-docker</name>
</property>
</activation>
<properties>
- <packaging.type>jar</packaging.type>
<package-as-war>false</package-as-war>
</properties>
<dependencies>
@@ -174,7 +168,7 @@
</ports>
</container>
<to>
- <image>docker.io/apacheisis/demo-springboot</image>
+ <image>docker.io/apacheisis/demo-wicket</image>
<tags>
<tag>nightly</tag>
</tags>
@@ -189,111 +183,6 @@
</build>
</profile>
-
- <profile>
- <id>flavor-dryrun</id>
- <activation>
- <property>
- <name>flavor</name>
- <value>dryrun</value>
- </property>
- </activation>
- <properties>
- <packaging.type>jar</packaging.type>
- <package-as-war>false</package-as-war>
- </properties>
- <dependencies>
- <!-- add flavor specific here -->
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- <configuration>
- <from>
- <image>openjdk:13-alpine</image>
- </from>
- <container>
- <jvmFlags>
- <jvmFlag>-Xmx512m</jvmFlag>
- </jvmFlags>
- <mainClass>demoapp.webapp.wicket.DemoAppWicket</mainClass>
- <ports>
- <port>8080</port>
- </ports>
- </container>
- <to>
- <image>docker.io/apacheisis/demo-dryrun</image>
- <auth>
- <username>${env.DOCKER_REGISTRY_USERNAME}</username>
- <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
- </auth>
- </to>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
-
- <profile>
- <id>flavor-tomcat</id>
- <activation>
- <property>
- <name>flavor</name>
- <value>tomcat</value>
- </property>
- </activation>
- <properties>
- <packaging.type>war</packaging.type>
- <package-as-war>true</package-as-war>
- </properties>
- <dependencies>
- <!-- add flavor specific here -->
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- <configuration>
- <from>
- <image>tomcat:9-jdk11-openjdk</image>
- </from>
- <container>
- <appRoot>/usr/local/tomcat/webapps/demo</appRoot>
- </container>
- <to>
- <image>docker.io/apacheisis/demo-tomcat</image>
- <auth>
- <username>${env.DOCKER_REGISTRY_USERNAME}</username>
- <password>${env.DOCKER_REGISTRY_PASSWORD}</password>
- </auth>
- </to>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>flavor-payara</id>
- <activation>
- <property>
- <name>flavor</name>
- <value>payara</value>
- </property>
- </activation>
- <properties>
- <packaging.type>war</packaging.type>
- <package-as-war>true</package-as-war>
- </properties>
- <dependencies>
- <!-- add flavor specific here -->
- </dependencies>
- </profile>
-
</profiles>
</project>
\ No newline at end of file