aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2019-02-27 20:45:55 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-27 20:45:55 +0000
commitf03f9e0121e5e39f1b8e250c287b0a1209e1fb3f (patch)
tree5b1634bbde6cd55fcac718db7e7629c7280605bb
parent5b0a892f1f7f35cd4c1621e15aec778fe031b6fd (diff)
parentb7e96e84e4ce79b5ca025f788fedc62ad2196c1c (diff)
Merge "Fix sniroemulator to make container arm64-ready"
-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