From d605a63b3a5d733229f04ee4a5d3ee468221ed5a Mon Sep 17 00:00:00 2001
From: huguenindo <dominique.huguenin@rpn.ch>
Date: Tue, 4 Jan 2022 10:11:54 +0100
Subject: [PATCH 1/4] feat: ajout Dockerfile

---
 .gitignore | 1 +
 Dockerfile | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 Dockerfile

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f22d65f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM tomcat:9.0
+LABEL maintainer="dominique.huguenin@rpn.ch"
+
+ADD target/campanule.rest*.war /usr/local/tomcat/webapps/ROOT.war
+
+EXPOSE 8080
+
+CMD ["catalina.sh", "run"]
\ No newline at end of file
-- 
GitLab


From 8e9caf0afab069b3cc1c02698141b479bff59bab Mon Sep 17 00:00:00 2001
From: huguenindo <dominique.huguenin@rpn.ch>
Date: Wed, 5 Jan 2022 17:10:23 +0100
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20g=C3=A9n=C3=A9ration=20de=20contene?=
 =?UTF-8?q?ur=20docker=20durant=20la=20phase=20deploy=20de=20maven?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                  | 90 +++++++++++++++++++++++-
 Dockerfile => src/main/docker/Dockerfile |  2 +-
 2 files changed, 90 insertions(+), 2 deletions(-)
 rename Dockerfile => src/main/docker/Dockerfile (57%)

diff --git a/pom.xml b/pom.xml
index 5319bc9..1c7e244 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,20 @@
                     </execution>                
                 </executions>
             </plugin>            
-            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-help-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>show-profiles</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>active-profiles</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>            
         </plugins>
         <pluginManagement>
             <plugins>
@@ -162,5 +175,80 @@
         </pluginManagement>
         
     </build>
+    
+    <profiles>
+        <profile>
+            <id>docker</id>
+            <activation>
+                <file>
+                    <exists>src/main/docker/Dockerfile</exists>
+                </file>
+            </activation>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <artifactId>maven-resources-plugin</artifactId>
+                        <version>3.2.0</version>
+                        <executions>
+                            <execution>
+                                <id>copy-resources</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>copy-resources</goal>
+                                </goals>
+                                <configuration>
+                                    <outputDirectory>${basedir}/target</outputDirectory>
+                                    <resources>
+                                        <resource>
+                                            <directory>src/main/docker</directory>
+                                            <filtering>true</filtering>
+                                        </resource>
+                                    </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <phase>deploy</phase>
+                                <configuration>
+                                    <target>
+                                        <exec executable="docker">
+                                            <arg value="build"/>
+                                            <arg value="-t"/>
+                                            <arg value="domh65/${project.artifactId}:${project.version}"/>
+                                            <arg value="target"/>
+                                        </exec>
+                                        <exec executable="docker">
+                                            <arg value="push"/>
+                                            <arg value="domh65/${project.artifactId}:${project.version}"/>
+                                        </exec>
+                                        <exec executable="docker">
+                                            <arg value="tag"/>
+                                            <arg value="domh65/${project.artifactId}:${project.version}"/>
+                                            <arg value="domh65/${project.artifactId}:latest"/>
+                                        </exec>
+                                        <exec executable="docker">
+                                            <arg value="push"/>
+                                            <arg value="domh65/${project.artifactId}:latest"/>
+                                        </exec>
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>        
+    </profiles>
 
 </project>
diff --git a/Dockerfile b/src/main/docker/Dockerfile
similarity index 57%
rename from Dockerfile
rename to src/main/docker/Dockerfile
index f22d65f..70a7133 100644
--- a/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,7 +1,7 @@
 FROM tomcat:9.0
 LABEL maintainer="dominique.huguenin@rpn.ch"
 
-ADD target/campanule.rest*.war /usr/local/tomcat/webapps/ROOT.war
+ADD ${project.artifactId}-${project.version} /usr/local/tomcat/webapps/ROOT
 
 EXPOSE 8080
 
-- 
GitLab


From 9b19c7b82d8fd3fa92e6a20901d990295d93d67e Mon Sep 17 00:00:00 2001
From: huguenindo <dominique.huguenin@rpn.ch>
Date: Wed, 5 Jan 2022 17:11:26 +0100
Subject: [PATCH 3/4] [maven-release-plugin] prepare release
 campanule.rest-1.2.0

---
 pom.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c7e244..1c66bc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>dhu</groupId>
     <artifactId>campanule.rest</artifactId>
-    <version>1.2.0-SNAPSHOT</version>
+    <version>1.2.0</version>
     <packaging>war</packaging>
 
     <properties>
@@ -38,7 +38,7 @@
         <connection>scm:git:git@mylos.cifom.ch:dhu.projets/campanule/campanule.rest</connection>
         <developerConnection>scm:git:git@mylos.cifom.ch:dhu.projets/campanule/campanule.rest</developerConnection>
         <url>https://mylos.cifom.ch/gitlab/dhu.projets/campanule/campanule.rest</url>
-        <tag>HEAD</tag>
+        <tag>campanule.rest-1.2.0</tag>
     </scm>
 
     <repositories>
@@ -220,23 +220,23 @@
                                 <configuration>
                                     <target>
                                         <exec executable="docker">
-                                            <arg value="build"/>
-                                            <arg value="-t"/>
-                                            <arg value="domh65/${project.artifactId}:${project.version}"/>
-                                            <arg value="target"/>
+                                            <arg value="build" />
+                                            <arg value="-t" />
+                                            <arg value="domh65/${project.artifactId}:${project.version}" />
+                                            <arg value="target" />
                                         </exec>
                                         <exec executable="docker">
-                                            <arg value="push"/>
-                                            <arg value="domh65/${project.artifactId}:${project.version}"/>
+                                            <arg value="push" />
+                                            <arg value="domh65/${project.artifactId}:${project.version}" />
                                         </exec>
                                         <exec executable="docker">
-                                            <arg value="tag"/>
-                                            <arg value="domh65/${project.artifactId}:${project.version}"/>
-                                            <arg value="domh65/${project.artifactId}:latest"/>
+                                            <arg value="tag" />
+                                            <arg value="domh65/${project.artifactId}:${project.version}" />
+                                            <arg value="domh65/${project.artifactId}:latest" />
                                         </exec>
                                         <exec executable="docker">
-                                            <arg value="push"/>
-                                            <arg value="domh65/${project.artifactId}:latest"/>
+                                            <arg value="push" />
+                                            <arg value="domh65/${project.artifactId}:latest" />
                                         </exec>
                                     </target>
                                 </configuration>
-- 
GitLab


From 1c590b4970c6249c1bc2ddb176a7ebcf484addf7 Mon Sep 17 00:00:00 2001
From: huguenindo <dominique.huguenin@rpn.ch>
Date: Wed, 5 Jan 2022 17:11:29 +0100
Subject: [PATCH 4/4] [maven-release-plugin] prepare for next development
 iteration

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c66bc9..1182ca9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>dhu</groupId>
     <artifactId>campanule.rest</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <properties>
@@ -38,7 +38,7 @@
         <connection>scm:git:git@mylos.cifom.ch:dhu.projets/campanule/campanule.rest</connection>
         <developerConnection>scm:git:git@mylos.cifom.ch:dhu.projets/campanule/campanule.rest</developerConnection>
         <url>https://mylos.cifom.ch/gitlab/dhu.projets/campanule/campanule.rest</url>
-        <tag>campanule.rest-1.2.0</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <repositories>
-- 
GitLab