适配构建机本地镜像仓库推送
This commit is contained in:
parent
6f3182caf4
commit
a7d26810ad
@ -402,6 +402,8 @@ COMMIT_TAG="${TARGET}-${SHORT_SHA}"
|
||||
MOVING_TAG="${TARGET}-latest"
|
||||
REGISTRY_COMMIT="${BUILD_SERVER_IP}:${REGISTRY_PORT}/${IMAGE_NAME}:${COMMIT_TAG}"
|
||||
REGISTRY_MOVING="${BUILD_SERVER_IP}:${REGISTRY_PORT}/${IMAGE_NAME}:${MOVING_TAG}"
|
||||
LOCAL_REGISTRY_COMMIT="localhost:${REGISTRY_PORT}/${IMAGE_NAME}:${COMMIT_TAG}"
|
||||
LOCAL_REGISTRY_MOVING="localhost:${REGISTRY_PORT}/${IMAGE_NAME}:${MOVING_TAG}"
|
||||
|
||||
test -f Dockerfile || fail "Dockerfile missing after Git sync"
|
||||
test -f package.json || fail "package.json missing after Git sync"
|
||||
@ -413,18 +415,20 @@ log "Image tag: $COMMIT_TAG"
|
||||
|
||||
if [ "$SKIP_BUILD" != "1" ]; then
|
||||
start_remote_step "Docker Build"
|
||||
docker pull "$REGISTRY_MOVING" >/dev/null 2>&1 || true
|
||||
docker pull "$LOCAL_REGISTRY_MOVING" >/dev/null 2>&1 || true
|
||||
|
||||
build_args=()
|
||||
if [ "$NO_CACHE" = "1" ]; then
|
||||
build_args+=(--no-cache)
|
||||
elif docker image inspect "$REGISTRY_MOVING" >/dev/null 2>&1; then
|
||||
build_args+=(--cache-from "$REGISTRY_MOVING")
|
||||
elif docker image inspect "$LOCAL_REGISTRY_MOVING" >/dev/null 2>&1; then
|
||||
build_args+=(--cache-from "$LOCAL_REGISTRY_MOVING")
|
||||
fi
|
||||
|
||||
DOCKER_BUILDKIT=1 docker build "${build_args[@]}" \
|
||||
-t "$IMAGE_NAME:$COMMIT_TAG" \
|
||||
-t "$IMAGE_NAME:$MOVING_TAG" \
|
||||
-t "$LOCAL_REGISTRY_COMMIT" \
|
||||
-t "$LOCAL_REGISTRY_MOVING" \
|
||||
-t "$REGISTRY_COMMIT" \
|
||||
-t "$REGISTRY_MOVING" \
|
||||
.
|
||||
@ -436,8 +440,8 @@ fi
|
||||
|
||||
if [ "$SKIP_PUSH" != "1" ]; then
|
||||
start_remote_step "Push Image"
|
||||
docker push "$REGISTRY_COMMIT"
|
||||
docker push "$REGISTRY_MOVING"
|
||||
docker push "$LOCAL_REGISTRY_COMMIT"
|
||||
docker push "$LOCAL_REGISTRY_MOVING"
|
||||
ok "Pushed image tags: $COMMIT_TAG, $MOVING_TAG"
|
||||
else
|
||||
warn "Skipping image push by request"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user