Commit e0100a73 authored by 道非仙's avatar 道非仙
Browse files

fix(ci): improve script formatting and echo image tag in build process

parent 4826fe9b
Pipeline #81986 failed with stage
in 2 seconds
...@@ -27,18 +27,17 @@ workflow: ...@@ -27,18 +27,17 @@ workflow:
script: script:
- set -eo pipefail - set -eo pipefail
- echo "DEBUG----- $(date '+%Y-%m-%d %H:%M:%S') Starting build process" - echo "DEBUG----- $(date '+%Y-%m-%d %H:%M:%S') Starting build process"
- > - |
if [ -n "$CI_COMMIT_TAG" ]; then if [ -n "$CI_COMMIT_TAG" ]; then
IMAGE_TAG="${CI_COMMIT_TAG#sub2api/}"; echo "IMAGE_TAG=${CI_COMMIT_TAG#sub2api/}"
else else
IMAGE_TAG="${CI_COMMIT_REF_NAME}"; echo "IMAGE_TAG=$CI_COMMIT_REF_NAME"
fi fi
- echo "Image tag: $IMAGE_TAG"
- echo "Logging into Harbor..." - echo "Logging into Harbor..."
- echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USERNAME" --password-stdin "$HARBOR_SERVICE" - echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USERNAME" --password-stdin "$HARBOR_SERVICE"
- docker build -f Dockerfile --build-arg VERSION="${VERSION}" --build-arg COMMIT="${COMMIT}" --build-arg DATE="${DATE}" -t "$HARBOR_SERVICE/$HARBOR_REGISTRY/sub2api:$IMAGE_TAG" . - docker build -f Dockerfile --build-arg VERSION="${VERSION}" --build-arg COMMIT="${COMMIT}" --build-arg DATE="${DATE}" -t "$HARBOR_SERVICE/$HARBOR_REGISTRY/sub2api:${IMAGE_TAG}" .
- docker push "$HARBOR_SERVICE/$HARBOR_REGISTRY/sub2api:$IMAGE_TAG" - docker push "$HARBOR_SERVICE/$HARBOR_REGISTRY/sub2api:${IMAGE_TAG}"
- docker rmi "$HARBOR_SERVICE/$HARBOR_REGISTRY/sub2api:$IMAGE_TAG" || true - docker rmi "$HARBOR_SERVICE/$HARBOR_REGISTRY/sub2api:${IMAGE_TAG}" || true
sub2api: sub2api:
stage: build stage: build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment