diff options
| author |   Simon Hrabos <simon.hrabos@tieto.com> | 2019-03-28 05:17:18 -0400 |
|---|---|---|
| committer | Simon Hrabos <simon.hrabos@tieto.com> | 2019-04-02 07:54:10 +0000 |
| commit | cd9e460cfa7cbd090156045711c4d95efa6765b3 (patch) | |
| tree | 61c5cd706c5c9e1085ae913308e4a6190796300f | |
| parent | d69066a2ed223fc5f525fcff520c5740736c5cb6 (diff) | |
Make images arm-64 compatible
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>
| -rw-r--r-- | cdt/pom.xml | 4 | ||||
| -rw-r--r-- | installation/appc/pom.xml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cdt/pom.xml b/cdt/pom.xml index bd408b5..6be529a 100644 --- a/cdt/pom.xml +++ b/cdt/pom.xml @@ -210,7 +210,7 @@ limitations under the License. <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> @@ -219,7 +219,7 @@ limitations under the License. <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> diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml index c1fa756..79f709f 100644 --- a/installation/appc/pom.xml +++ b/installation/appc/pom.xml @@ -48,6 +48,7 @@ limitations under the License. <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> </properties> @@ -261,7 +262,7 @@ limitations under the License. <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> @@ -270,7 +271,7 @@ limitations under the License. <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> |