summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xhuawei/vnfmadapter/VnfmadapterService/docker/build_image.sh19
-rwxr-xr-xnokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh19
-rwxr-xr-xzte/vmanager/docker/build_image.sh19
3 files changed, 45 insertions, 12 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
index b83cf6cd..923d818e 100755
--- a/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
+++ b/huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh
@@ -6,11 +6,12 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.0.0"
PROJECT="vfc"
IMAGE="nfvo/svnfm/huawei"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -21,13 +22,23 @@ fi
function build_image {
echo "Start build docker image: ${IMAGE_NAME}"
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image_tag {
+ TAG_NAME=$1
+ echo "Start push ${TAG_NAME}"
+ docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+ docker push ${TAG_NAME}
}
function push_image {
- echo "Start push docker image: ${IMAGE_NAME}"
- docker push ${IMAGE_NAME}:${VERSION}
+ echo "Start push ${IMAGE_NAME}:latest"
docker push ${IMAGE_NAME}:latest
+
+ push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}
}
build_image
diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
index 914f5f6f..c6114fe5 100755
--- a/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
+++ b/nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh
@@ -22,11 +22,12 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.0.0"
PROJECT="vfc"
IMAGE="nfvo/svnfm/nokia"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -37,13 +38,23 @@ fi
function build_image {
echo "Start build docker image: ${IMAGE_NAME}"
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image_tag {
+ TAG_NAME=$1
+ echo "Start push ${TAG_NAME}"
+ docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+ docker push ${TAG_NAME}
}
function push_image {
- echo "Start push docker image: ${IMAGE_NAME}"
- docker push ${IMAGE_NAME}:${VERSION}
+ echo "Start push ${IMAGE_NAME}:latest"
docker push ${IMAGE_NAME}:latest
+
+ push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}
}
build_image
diff --git a/zte/vmanager/docker/build_image.sh b/zte/vmanager/docker/build_image.sh
index 9bf3b60a..4aed97c4 100755
--- a/zte/vmanager/docker/build_image.sh
+++ b/zte/vmanager/docker/build_image.sh
@@ -6,11 +6,12 @@ cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
ORG="onap"
-VERSION="1.0.0-SNAPSHOT"
+VERSION="1.0.0"
PROJECT="vfc"
IMAGE="ztevmanagerdriver"
DOCKER_REPOSITORY="nexus3.onap.org:10003"
IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}"
+TIMESTAMP=$(date +"%Y%m%dT%H%M%S")
if [ $HTTP_PROXY ]; then
BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"
@@ -21,13 +22,23 @@ fi
function build_image {
echo "Start build docker image: ${IMAGE_NAME}"
- docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+ docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:latest .
+}
+
+function push_image_tag {
+ TAG_NAME=$1
+ echo "Start push ${TAG_NAME}"
+ docker tag ${IMAGE_NAME}:latest ${TAG_NAME}
+ docker push ${TAG_NAME}
}
function push_image {
- echo "Start push docker image: ${IMAGE_NAME}"
- docker push ${IMAGE_NAME}:${VERSION}
+ echo "Start push ${IMAGE_NAME}:latest"
docker push ${IMAGE_NAME}:latest
+
+ push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest
+ push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP}
}
build_image