summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xems/microservice-standalone/src/main/assembly/docker/Dockerfile2
-rwxr-xr-xems/microservice-standalone/src/main/assembly/docker/build_image.sh12
-rw-r--r--ems/version.properties2
3 files changed, 8 insertions, 8 deletions
diff --git a/ems/microservice-standalone/src/main/assembly/docker/Dockerfile b/ems/microservice-standalone/src/main/assembly/docker/Dockerfile
index a3dd32c..11e55bd 100755
--- a/ems/microservice-standalone/src/main/assembly/docker/Dockerfile
+++ b/ems/microservice-standalone/src/main/assembly/docker/Dockerfile
@@ -13,7 +13,7 @@ WORKDIR /service
RUN mkdir emsdriver
# get binary zip from nexus
-RUN wget -q -O emsdiver-standalone.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.ems.ems&a=emsdriver-standalone&v=LATEST&e=zip' && \
+RUN wget -q -O emsdiver-standalone.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.ems.ems&a=emsdriver-standalone&v=1.0.2&e=zip' && \
unzip emsdiver-standalone.zip -d emsdriver && \
rm -rf emsdiver-standalone.zip
diff --git a/ems/microservice-standalone/src/main/assembly/docker/build_image.sh b/ems/microservice-standalone/src/main/assembly/docker/build_image.sh
index 0253a1f..5fcdc54 100755
--- a/ems/microservice-standalone/src/main/assembly/docker/build_image.sh
+++ b/ems/microservice-standalone/src/main/assembly/docker/build_image.sh
@@ -6,7 +6,7 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.1"
+VERSION="1.0.2"
PROJECT="vfc"
IMAGE="emsdriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -21,20 +21,20 @@ if [ $HTTPS_PROXY ]; then
fi
function build_image {
- echo "Start build docker image: ${IMAGE_NAME}"
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .
+ echo "Start build docker image: ${IMAGE_NAME}:${VERSION}-latest"
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION}-latest .
}
function push_image_tag {
TAG_NAME=$1
echo "Start push ${TAG_NAME}"
- docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+ docker tag ${IMAGE_NAME}:${VERSION}-latest ${TAG_NAME}
docker push ${TAG_NAME}
}
function push_image {
- echo "Start push ${IMAGE_NAME}:latest"
- docker push ${IMAGE_NAME}:latest
+ echo "Start push ${IMAGE_NAME}:${VERSION}-latest"
+ docker push ${IMAGE_NAME}:${VERSION}-latest
push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
diff --git a/ems/version.properties b/ems/version.properties
index 3903250..2263272 100644
--- a/ems/version.properties
+++ b/ems/version.properties
@@ -1,6 +1,6 @@
major=1
minor=0
-patch=1
+patch=2
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT