summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d69066a)
Modify versions of docker maven plugin due to arm64 compatibility
Change-Id: Id4292b2ee6f1586072399cd8f79c0c24f47d8005
Issue-ID: INT-965
Issue-ID: INT-966
Signed-off-by: Simon Hrabos <simon.hrabos@tieto.com>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>0.28.0</version>
<inherited>false</inherited>
<configuration>
<images>
<inherited>false</inherited>
<configuration>
<images>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${dockertag1}</tag>
<tag>${dockertag2}</tag>
<tags>
<tag>${dockertag1}</tag>
<tag>${dockertag2}</tag>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<!--Determines the version of the cdt-proxy-service to download and install-->
<appc.cdt.version>1.5.0-SNAPSHOT</appc.cdt.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
<!--Determines the version of the cdt-proxy-service to download and install-->
<appc.cdt.version>1.5.0-SNAPSHOT</appc.cdt.version>
+ <docker.plugin.version>0.28.0</docker.plugin.version>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.16.5</version>
+ <version>${docker.plugin.version}</version>
<inherited>false</inherited>
<configuration>
<images>
<inherited>false</inherited>
<configuration>
<images>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${basedir}/target/docker-stage</dockerFileDir>
- <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile>
+ <dockerFile>Dockerfile</dockerFile>
<tags>
<tag>${dockertag1}</tag>
<tag>${dockertag2}</tag>
<tags>
<tag>${dockertag1}</tag>
<tag>${dockertag2}</tag>