diff --git a/.gitea/workflows/build_nopush.yml b/.gitea/workflows/build_nopush.yml index 4f6ef34..4b88a15 100644 --- a/.gitea/workflows/build_nopush.yml +++ b/.gitea/workflows/build_nopush.yml @@ -42,12 +42,12 @@ jobs: echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - # - name: Set Docker Version - # id: get_version - # run: | - # DOCKER_VERSION=$(grep -oP '(?<=^ARG VERSION=).*' Dockerfile) - # echo "Docker version: $DOCKER_VERSION" - # echo "::set-output name=tag::$DOCKER_VERSION" + - name: Set Docker Version + id: get_version + run: | + DOCKER_VERSION=$(grep -oP '(?<=^ARG VERSION=).*' Dockerfile) + echo "Docker version: $DOCKER_VERSION" + echo "::set-output name=tag::$DOCKER_VERSION" - name: Build and push uses: docker/build-push-action@v4 @@ -58,5 +58,4 @@ jobs: linux/amd64 push: false tags: | - ${{ env.REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.REPO_VERSION }} - ${{ env.REGISTRY }}/${{ env.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ env.DOCKER_LATEST }} + ${{ env.REGISTRY }}/marko/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.get_version.outputs.tag }}