docker deploy

This commit is contained in:
Nicolas Héron 2019-08-27 15:21:00 +02:00
commit 54e4d6de45
8 changed files with 50 additions and 28 deletions

View file

@ -324,7 +324,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-admin-console</name> <name>runtime-admin-console:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -378,12 +378,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-admin-console:${project.version}</name> <name>runtime-admin-console:${version.number}</name>
<alias>runtime-admin-console</alias> <alias>runtime-admin-console</alias>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -407,7 +407,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

View file

@ -169,7 +169,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>swimmingpool-web-ui</name> <name>swimmingpool-web-ui:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -223,12 +223,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-admin-console:${project.version}</name> <name>runtime-admin-console:${version.number}</name>
<alias>runtime-admin-console</alias> <alias>runtime-admin-console</alias>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -252,7 +252,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

View file

@ -168,7 +168,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>kie-wb</name> <name>kie-wb:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -223,12 +223,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>kie-wb</name> <name>kie-wb:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -265,7 +265,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

View file

@ -119,7 +119,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-indexer</name> <name>runtime-indexer:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -170,12 +170,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-indexer</name> <name>runtime-indexer:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -195,7 +195,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

View file

@ -259,7 +259,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-proxy</name> <name>runtime-proxy:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -313,12 +313,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-proxy</name> <name>runtime-proxy:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -343,7 +343,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

View file

@ -135,7 +135,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-reverse-proxy</name> <name>runtime-reverse-proxy:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -185,12 +185,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>runtime-reverse-proxy</name> <name>runtime-reverse-proxy:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -213,7 +213,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

View file

@ -36,7 +36,7 @@
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>keycloak-db</name> <name>keycloak-db:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -86,12 +86,12 @@
<version>0.21.0</version> <version>0.21.0</version>
<configuration> <configuration>
<registry>registry.hub.docker.com/pymmasoftware</registry> <registry>${registry.host}</registry>
<dockerHost>${docker.Host}</dockerHost> <dockerHost>${docker.Host}</dockerHost>
<verbose>true</verbose> <verbose>true</verbose>
<images> <images>
<image> <image>
<name>keycloak-db</name> <name>keycloak-db:${version.number}</name>
<build> <build>
<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir> <dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
@ -111,7 +111,7 @@
</image> </image>
</images> </images>
<authConfig> <authConfig>
<username>pymmasoftwaredeploy</username> <username>nheron</username>
<password>pymmalomme</password> <password>pymmalomme</password>
</authConfig> </authConfig>
<retries>5</retries> <retries>5</retries>

22
pom.xml
View file

@ -26,6 +26,9 @@
<spring.version>4.3.16.RELEASE</spring.version> <spring.version>4.3.16.RELEASE</spring.version>
<version.thorntail>2.2.1.Final</version.thorntail> <version.thorntail>2.2.1.Final</version.thorntail>
<!--registry.host>registry.hub.docker.com/pymmasoftware</registry.host-->
<registry.host>192.168.1.122:18083</registry.host>
<version.number>${git.commit.time}.${git.commit.id.abbrev}</version.number>
</properties> </properties>
<profiles> <profiles>
<profile> <profile>
@ -79,6 +82,25 @@
<target>1.8</target> <target>1.8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.4</version>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<dateFormat>yyyyMMdd-HHmmss</dateFormat><!-- human-readable part of the version number -->
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<generateGitPropertiesFile>false
</generateGitPropertiesFile><!-- somehow necessary. otherwise the variables are not available in the pom -->
</configuration>
</plugin>
<!--plugin> <!--plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>