diff --git a/build_image.sh b/build_image.sh index 75d27ea..3260371 100755 --- a/build_image.sh +++ b/build_image.sh @@ -17,6 +17,12 @@ function docker_build() { { log_error "[!] Failed to build $tag_name"; exit 1; } } +function docker_push() { + full_name="$IMAGE_PREFIX/$1" + $DOCKER push "$full_name" || + { log_error "[!] Failed to push $full_name"; exit 1; } +} + function build_base() { log_info "[+] Building Base Images" pushd resource/runner || exit 1 @@ -27,8 +33,8 @@ function build_base() { function push_base() { log_info "[+] Pushing Base Images" - $DOCKER push "$IMAGE_PREFIX/ubuntu-full:latest" - $DOCKER push "$IMAGE_PREFIX/ubuntu-run:latest" + docker_push "ubuntu-full:latest" + docker_push "ubuntu-run:latest" } function build_server() { @@ -49,16 +55,16 @@ function build_runner() { function push_server() { log_info "[+] Pushing Server Images" - $DOCKER push "$IMAGE_PREFIX/woj-server:latest" + docker_push "woj-server:latest" $DOCKER tag "$IMAGE_PREFIX/woj-server:latest" "$IMAGE_PREFIX/woj-server:$VERSION" - $DOCKER push "$IMAGE_PREFIX/woj-server:$VERSION" + docker_push "woj-server:$VERSION" } function push_runner() { log_info "[+] Pushing Runner Images" - $DOCKER push "$IMAGE_PREFIX/woj-runner:latest" + docker_push "woj-runner:latest" $DOCKER tag "$IMAGE_PREFIX/woj-runner:latest" "$IMAGE_PREFIX/woj-runner:$VERSION" - $DOCKER push "$IMAGE_PREFIX/woj-runner:$VERSION" + docker_push "woj-runner:$VERSION" } if [ "$1" == "base" ]; then