Adding version as variable in Dockerfiles

Issue-ID: INT-1517
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I701583e9d5ed1089178cd5bd590034dd7bcc9402

diff --git a/netconfsimulator/Dockerfile_app b/netconfsimulator/Dockerfile_app
index 2043b8a..589be17 100644 (file)
--- a/netconfsimulator/Dockerfile_app
+++ b/netconfsimulator/Dockerfile_app
@@ -1,4 +1,7 @@
 FROM docker.io/openjdk:8-jre-alpine
+
+ARG VERSION=${version}
+
 ADD target/libs /app/libs
-ADD target/netconfsimulator-1.0.0-SNAPSHOT.jar /app/netconf-simulator.jar
+ADD target/netconfsimulator-${VERSION}.jar /app/netconf-simulator.jar
 CMD java -cp /app/libs/*:/app/netconf-simulator.jar org.onap.netconfsimulator.Main

diff --git a/netconfsimulator/docker/Dockerfile b/netconfsimulator/docker/Dockerfile
index 63bb3ee..d7d27a9 100644 (file)
--- a/netconfsimulator/docker/Dockerfile
+++ b/netconfsimulator/docker/Dockerfile
@@ -1,4 +1,7 @@
 FROM docker.io/openjdk:8-jre-alpine
+
+ARG VERSION=${version}
+
 ADD libs /app/libs
-ADD netconfsimulator-1.0.0-SNAPSHOT.jar /app/netconf-simulator.jar
+ADD netconfsimulator-${VERSION}.jar /app/netconf-simulator.jar
 CMD java -cp /app/libs/*:/app/netconf-simulator.jar org.onap.netconfsimulator.Main

diff --git a/pnfsimulator/Dockerfile b/pnfsimulator/Dockerfile
index 4202047..7cadcf4 100644 (file)
--- a/pnfsimulator/Dockerfile
+++ b/pnfsimulator/Dockerfile
@@ -1,6 +1,9 @@
 FROM docker.io/openjdk:8-jre-alpine
+
+ARG VERSION=${version}
+
 ADD target/libs /app/libs
-ADD target/pnfsimulator-1.0.0-SNAPSHOT.jar /app/pnf-simulator.jar
+ADD target/pnfsimulator-${VERSION}.jar /app/pnf-simulator.jar
 CMD apk update
 CMD apk add ca-certificates
 ADD certificates  /usr/local/share/ca-certificates/