diff options
| author |   HuabingZhao <zhao.huabing@zte.com.cn> | 2017-08-17 14:31:23 +0000 |
|---|---|---|
| committer | HuabingZhao <zhao.huabing@zte.com.cn> | 2017-08-17 14:31:48 +0000 |
| commit | 57426fd1ba7b852850e413c3cb4023caf17b982d (patch) | |
| tree | 38e2f3e1fd3a9c4b82344441246f5724f6f6ea8b | |
| parent | 9b8d7b875dcf54a25bd14783397ad6b9851e4262 (diff) | |
Use the ONAP docker registry
Issue-Id: MSB-18
Change-Id: Idf566df2f0a8ca9266fdb6b8d8d82847bb8d050f
Signed-off-by: HuabingZhao <zhao.huabing@zte.com.cn>
| -rw-r--r-- | build4basedocker.sh | 2 | ||||
| -rw-r--r-- | build4docker.sh | 2 | ||||
| -rw-r--r-- | ci/build_docker_image.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build4basedocker.sh b/build4basedocker.sh index 473f4fe..48bfa0f 100644 --- a/build4basedocker.sh +++ b/build4basedocker.sh @@ -40,7 +40,7 @@ chmod +x build_docker_image.sh -docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION} +docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION} ./build_docker_image.sh -n=${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME} -v=${DOCKER_RELEASE_VERSION} -d=./docker diff --git a/build4docker.sh b/build4docker.sh index cb91d02..53012d4 100644 --- a/build4docker.sh +++ b/build4docker.sh @@ -46,7 +46,7 @@ chmod 777 build_docker_image.sh docker rm -f ${DOCKER_RUN_NAME} -docker rmi ${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION} +docker rmi ${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME}:${DOCKER_RELEASE_VERSION} ./build_docker_image.sh -n=${DOCKER_REPOSITORY}/onap/msb/${DOCKER_IMAGE_NAME} -v=${DOCKER_RELEASE_VERSION} -d=./docker diff --git a/ci/build_docker_image.sh b/ci/build_docker_image.sh index 7b6b546..45ac274 100644 --- a/ci/build_docker_image.sh +++ b/ci/build_docker_image.sh @@ -24,7 +24,7 @@ if [[ ${NAME} && ${VERSION} && ${DIR} ]]; then echo "begin to build image ${NAME}.." docker build --no-cache -t ${NAME}:${VERSION} . >/dev/null || { echo -e "\nBuild docker image failed!";exit 1; } docker rmi $(docker images | grep "^<none>" | awk '{print $3}') &>/dev/null - docker save -o ${NAME}.tar ${NAME}:${VERSION} >/dev/null || { rm -f ${NAME}.tar &>/dev/null;echo -e "\nSave docker image failed!";exit 1; } + # docker save -o ${NAME}.tar ${NAME}:${VERSION} >/dev/null || { rm -f ${NAME}.tar &>/dev/null;echo -e "\nSave docker image failed!";exit 1; } if [ ! -d ${DIR} ]; then mkdir -p ${DIR} fi |