diff --git a/.gitea/workflows/release-nightly.yml b/.gitea/workflows/release-nightly.yml index 9b8879b2..75e28589 100644 --- a/.gitea/workflows/release-nightly.yml +++ b/.gitea/workflows/release-nightly.yml @@ -71,6 +71,11 @@ jobs: - name: Echo the tag run: echo "${{ env.DOCKER_ORG }}/runner:nightly${{ matrix.variant.tag_suffix }}" + - name: Get Meta + id: meta + run: | + echo REPO_VERSION=$(git describe --tags --always | sed 's/-/+/' | sed 's/^v//') >> $GITHUB_OUTPUT + - name: Build and push uses: docker/build-push-action@v7 with: @@ -83,3 +88,5 @@ jobs: push: true tags: | ${{ env.DOCKER_ORG }}/runner:nightly${{ matrix.variant.tag_suffix }} + build-args: | + VERSION=${{ steps.meta.outputs.REPO_VERSION }} diff --git a/.gitea/workflows/release-tag.yml b/.gitea/workflows/release-tag.yml index aef461d8..0d054ee9 100644 --- a/.gitea/workflows/release-tag.yml +++ b/.gitea/workflows/release-tag.yml @@ -96,3 +96,5 @@ jobs: linux/arm64 push: true tags: ${{ steps.docker_meta.outputs.tags }} + build-args: | + VERSION=${{ steps.docker_meta.outputs.version }} diff --git a/Dockerfile b/Dockerfile index 707e3be8..63bfc7ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,11 @@ RUN make clean && make build # FROM docker:29-dind AS dind +ARG VERSION=dev + +LABEL org.opencontainers.image.source="https://gitea.com/gitea/runner" +LABEL org.opencontainers.image.version="${VERSION}" + RUN apk add --no-cache s6 bash git tzdata COPY --from=builder /opt/src/runner/gitea-runner /usr/local/bin/gitea-runner @@ -34,6 +39,11 @@ ENTRYPOINT ["s6-svscan","/etc/s6"] # FROM docker:29-dind-rootless AS dind-rootless +ARG VERSION=dev + +LABEL org.opencontainers.image.source="https://gitea.com/gitea/runner" +LABEL org.opencontainers.image.version="${VERSION}" + USER root RUN apk add --no-cache s6 bash git tzdata @@ -54,6 +64,12 @@ ENTRYPOINT ["s6-svscan","/etc/s6"] # # FROM alpine AS basic + +ARG VERSION=dev + +LABEL org.opencontainers.image.source="https://gitea.com/gitea/runner" +LABEL org.opencontainers.image.version="${VERSION}" + RUN apk add --no-cache tini bash git tzdata COPY --from=builder /opt/src/runner/gitea-runner /usr/local/bin/gitea-runner