diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 3faa90c..d1a40a6 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -13,18 +13,18 @@ jobs: echo "[***] Build hook running" cd ${{ gitea.workspace }}/StableV2/ VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1) - IMAGE_NAME=docker-rspamd + docker build \ --build-arg VERSION=${VERSION} \ --build-arg COMMIT=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^\([[:xdigit:]]\{40\}\)[[:blank:]]refs\/tags\/${VERSION}^{}$/\1/p" | xargs git rev-parse --short) \ --build-arg BRANCH=$(git rev-parse --abbrev-ref HEAD) \ --build-arg DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \ - -t ${{ vars.DOCKER_REPO }}/gnilebein/${IMAGE_NAME} . + -t ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }} . - run: echo ${IMAGE_NAME} - name: Push Image run: | VERSION=$(git ls-remote --tags -q https://github.com/rspamd/rspamd | sed -n "s/^[[:xdigit:]]\{40\}[[:blank:]]refs\/tags\/\([0-9]\{1\}\.[0-9]\{1,2\}\($\|\.[0-9]\{1,2\}$\)\)/\1/p" | sort --version-sort | tail -1) docker tag \ "${IMAGE_NAME}" \ - "${{ vars.DOCKER_REPO }}/gnilebein/${IMAGE_NAME}:stable-${VERSION}" - docker push ${{ vars.DOCKER_REPO }}/gnilebein/${IMAGE_NAME}:latest \ No newline at end of file + "${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:stable-${VERSION}" + docker push ${{ vars.DOCKER_REPO }}/gnilebein/${{ vars.IMAGE_NAME }}:latest \ No newline at end of file