aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Puzikov <dmitry.puzikov@tieto.com>2019-02-21 16:30:05 +0100
committerDmitry Puzikov <dmitry.puzikov@tieto.com>2019-02-22 15:07:03 +0100
commitb7e96e84e4ce79b5ca025f788fedc62ad2196c1c (patch)
tree55896f45cfb8f74c52656c7539602fa0c61ff3ec
parentced503350203184b16f1835d6cc735f1a921ae11 (diff)
Fix sniroemulator to make container arm64-ready
Swicth from debian based image to alpine based image. Fix docker-plugin version. Change-Id: I87af14b9785f70f49955ba299ed6e3d8ff9866f3 Issue-ID: INT-879 Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
-rw-r--r--test/mocks/sniroemulator/pom.xml8
-rw-r--r--test/mocks/sniroemulator/src/main/docker/Dockerfile7
2 files changed, 10 insertions, 5 deletions
diff --git a/test/mocks/sniroemulator/pom.xml b/test/mocks/sniroemulator/pom.xml
index 288ecb63b..2a1402b8f 100644
--- a/test/mocks/sniroemulator/pom.xml
+++ b/test/mocks/sniroemulator/pom.xml
@@ -16,10 +16,12 @@
</parent>
<properties>
- <dockerLocation>${basedir}/target</dockerLocation>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
+ <dockerLocation>${basedir}/target</dockerLocation>
+ <docker.tag>latest</docker.tag>
+ <docker.maven.plugin.version>1.2.0</docker.maven.plugin.version>
<versions.jackson>2.8.9</versions.jackson>
<jetty.version>9.2.22.v20170606</jetty.version>
<start-class>org.onap.integration.test.mocks.sniroemulator.MockApplication</start-class>
@@ -220,14 +222,14 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>${docker.maven.plugin.version}</version>
<configuration>
<verbose>true</verbose>
<registryUrl>${docker.push.registry}</registryUrl>
<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
<dockerDirectory>${dockerLocation}</dockerDirectory>
<imageTags>
- <imageTag>latest</imageTag>
+ <imageTag>${docker.tag}</imageTag>
</imageTags>
<forceTags>true</forceTags>
</configuration>
diff --git a/test/mocks/sniroemulator/src/main/docker/Dockerfile b/test/mocks/sniroemulator/src/main/docker/Dockerfile
index 05f3a5a2b..65e129a27 100644
--- a/test/mocks/sniroemulator/src/main/docker/Dockerfile
+++ b/test/mocks/sniroemulator/src/main/docker/Dockerfile
@@ -1,10 +1,13 @@
-FROM openjdk:8-jre
+FROM openjdk:8-jre-alpine
MAINTAINER Geora Barsky <georab@amdocs.com>
+# need bash as most scripts expect it
+RUN apk --no-cache add bash
+
RUN mkdir -p /var/wiremock/lib/
-ADD sniroemulator.jar /var/wiremock/lib/app.jar
+COPY sniroemulator.jar /var/wiremock/lib/app.jar
WORKDIR /home/wiremock