From b8ebf0f15d327a9a1e236b39ba07b49fe1556823 Mon Sep 17 00:00:00 2001 From: Roman Meshko Date: Sun, 7 Jun 2026 12:13:19 +0300 Subject: [PATCH] Fixed pipeline --- .woodpecker/02-build-push.yml | 15 +++++++++------ .woodpecker/build-push-jetson-trt104.yml | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.woodpecker/02-build-push.yml b/.woodpecker/02-build-push.yml index b80490a..29e9834 100644 --- a/.woodpecker/02-build-push.yml +++ b/.woodpecker/02-build-push.yml @@ -36,18 +36,21 @@ steps: from_secret: registry_token commands: - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - - export RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}" - - export SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##') - - export SAFE_BRANCH="${SAFE_BRANCH:-manual}" - - export TAG=${SAFE_BRANCH}-${TAG_SUFFIX} - - export BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) - | + RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}" + SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##') + SAFE_BRANCH="${SAFE_BRANCH:-manual}" + TAG="${SAFE_BRANCH}-${TAG_SUFFIX}" + BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) + echo "RAW_BRANCH=$RAW_BRANCH" + echo "SAFE_BRANCH=$SAFE_BRANCH" + echo "TAG=$TAG" docker build -f ${DOCKERFILE} \ --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA \ --label org.opencontainers.image.revision=$CI_COMMIT_SHA \ --label org.opencontainers.image.created=$BUILD_DATE \ --label org.opencontainers.image.source=$CI_REPO_URL \ -t $REGISTRY_HOST/azaion/detections:$TAG . - - docker push $REGISTRY_HOST/azaion/detections:$TAG + docker push $REGISTRY_HOST/azaion/detections:$TAG volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/.woodpecker/build-push-jetson-trt104.yml b/.woodpecker/build-push-jetson-trt104.yml index c1a23f1..9b0ece6 100644 --- a/.woodpecker/build-push-jetson-trt104.yml +++ b/.woodpecker/build-push-jetson-trt104.yml @@ -17,18 +17,21 @@ steps: from_secret: registry_token commands: - echo "$REGISTRY_TOKEN" | docker login "$REGISTRY_HOST" -u "$REGISTRY_USER" --password-stdin - - export RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}" - - export SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##') - - export SAFE_BRANCH="${SAFE_BRANCH:-manual}" - - export TAG=${SAFE_BRANCH}-arm-trt104 - - export BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) - | + RAW_BRANCH="${CI_COMMIT_BRANCH:-${WOODPECKER_COMMIT_BRANCH:-${CI_COMMIT_REF:-${WOODPECKER_COMMIT_REF:-manual}}}}" + SAFE_BRANCH=$(printf '%s' "$RAW_BRANCH" | sed 's#^refs/heads/##; s#^refs/tags/##; s#[^A-Za-z0-9_.-]#-#g; s#^-*##; s#-*$##') + SAFE_BRANCH="${SAFE_BRANCH:-manual}" + TAG="${SAFE_BRANCH}-arm-trt104" + BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) + echo "RAW_BRANCH=$RAW_BRANCH" + echo "SAFE_BRANCH=$SAFE_BRANCH" + echo "TAG=$TAG" docker build -f Dockerfile.jetson.trt104 \ --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA \ --label org.opencontainers.image.revision=$CI_COMMIT_SHA \ --label org.opencontainers.image.created=$BUILD_DATE \ --label org.opencontainers.image.source=$CI_REPO_URL \ -t $REGISTRY_HOST/azaion/detections:$TAG . - - docker push $REGISTRY_HOST/azaion/detections:$TAG + docker push $REGISTRY_HOST/azaion/detections:$TAG volumes: - /var/run/docker.sock:/var/run/docker.sock