From ed1530098cda610e58f56eedbfe90f9e13334453 Mon Sep 17 00:00:00 2001 From: Samuel Rounce Date: Mon, 1 Jul 2024 16:43:31 +0100 Subject: [PATCH] fix: Retain metadata in Docker image version This ensures metadata is not stripped from the version as reported in docker/metadata-action#384 --- .github/workflows/release.yaml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6d9b0c84..9b30e1ba 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -3,10 +3,11 @@ name: Release on: push: tags: - - 'v*' + - "v*" permissions: contents: write + packages: write jobs: docker-image: @@ -20,16 +21,22 @@ jobs: - name: Get tag version run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + - name: Get release date + run: | + echo "RELEASE_DATE=$(date --rfc-3339=date)" >> ${GITHUB_ENV} + - name: Print version run: | echo $RELEASE_VERSION echo ${{ env.RELEASE_VERSION }} + echo $RELEASE_DATE + echo ${{ env.RELEASE_DATE }} - name: Extract metadata (tags, labels) for Docker images id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@f7b4ed12385588c3f9bc252f0a2b520d83b52d48 with: - images: flashbots/mev-boost + images: ghcr.io/${{ github.event.repository.full_name }} tags: | type=sha type=pep440,pattern={{version}} @@ -42,11 +49,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub - uses: docker/login-action@v2 + - name: Log in to the Container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v3 @@ -55,6 +63,8 @@ jobs: push: true build-args: | VERSION=${{ env.RELEASE_VERSION }} + VCS_REF=${{ github.event.ref }} + BUILD_DATE=${{ env.RELEASE_DATE }} platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} @@ -120,4 +130,4 @@ jobs: with: args: release --config .goreleaser-release.yaml env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}