diff options
| -rw-r--r-- | nokia/vnfmdriver/version.properties | 13 | ||||
| -rwxr-xr-x | nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile | 5 | ||||
| -rwxr-xr-x | nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh | 2 |
3 files changed, 3 insertions, 17 deletions
diff --git a/nokia/vnfmdriver/version.properties b/nokia/vnfmdriver/version.properties deleted file mode 100644 index 2a3b2db1..00000000 --- a/nokia/vnfmdriver/version.properties +++ /dev/null @@ -1,13 +0,0 @@ -########################################################### -# Versioning variables -# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) -# because they are used in Jenkins, whose plug-in doesn't support - -major=1 -minor=0 -patch=2 - -base_version=${major}.${minor}.${patch} - -release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile index 85078d89..8a97c01a 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile @@ -38,13 +38,12 @@ ENV CATALINA_HOME /service # 50-microservice.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY # Set up microservice -# https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm&a=vfcadaptor-deployment&v=LATEST&e=zip -RUN wget -q -O nfvo-driver-vnfm-nokia-1.0.0-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm&a=vfcadaptor-deployment&v=LATEST&e=zip" && unzip -q -o -B nfvo-driver-vnfm-nokia-1.0.0-SNAPSHOT.zip && rm -f nfvo-driver-vnfm-nokia-1.0.0-SNAPSHOT.zip + +RUN wget -q -O nfvo-driver-vnfm-nokia.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=staging&g=org.onap.vfc.nfvo.driver.vnfm.svnfm&a=vfcadaptor-deployment&v=LATEST&e=zip" && unzip -q -o -B nfvo-driver-vnfm-nokia.zip && rm -f nfvo-driver-vnfm-nokia.zip # Set permissions RUN find . -type d -exec chmod o-w {} \; RUN find . -name "*.sh" -exec chmod +x {} \; EXPOSE 8486 -RUN echo ONAP nfvo-driver-vnfm-nokia 1.0.0-SNAPSHOT "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm&a=vfcadaptor-deployment&v=LATEST&e=zip" > ONAP_VERSION # 90-entrypoint.txt diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh index bed2a3bd..ca1bdb02 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh @@ -22,7 +22,7 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.0.2" +VERSION="1.1.0" PROJECT="vfc" IMAGE="nfvo/svnfm/nokia" DOCKER_REPOSITORY="nexus3.onap.org:10003" |