From 8458d4dc4da31f15b91010c9ff7a1a6c015f8661 Mon Sep 17 00:00:00 2001 From: Josh Baird Date: Wed, 24 Jul 2024 21:34:57 -0400 Subject: [PATCH] Fixes fluentd/fluent-bit image build CI workflows (#1259) * Re-factor. Signed-off-by: Josh Baird * Re-factor. Signed-off-by: Josh Baird * Re-factor. Signed-off-by: Josh Baird * Re-factor. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Skip arm64 builds for now. Signed-off-by: Josh Baird * Add arm64-base back in. Signed-off-by: Josh Baird * Fix tags. Signed-off-by: Josh Baird * Remove check-image. Signed-off-by: Josh Baird * Remove check. Signed-off-by: Josh Baird * Remove check. Signed-off-by: Josh Baird * Remove check. Signed-off-by: Josh Baird * Add tags back. Signed-off-by: Josh Baird * Add tags back. Signed-off-by: Josh Baird * Add tags back. Signed-off-by: Josh Baird * Add tags back. Signed-off-by: Josh Baird * Remove check image. Signed-off-by: Josh Baird * Remove platform from fb. Signed-off-by: Josh Baird * Remove platform from fb. Signed-off-by: Josh Baird --------- Signed-off-by: Josh Baird --- .github/workflows/build-fb-image.yaml | 137 +++------ .github/workflows/build-fd-image.yaml | 288 ++++++------------ .../workflows/clone-docker-image-action.yaml | 30 +- 3 files changed, 153 insertions(+), 302 deletions(-) diff --git a/.github/workflows/build-fb-image.yaml b/.github/workflows/build-fb-image.yaml index 6f71ccf37..c3597c1bc 100644 --- a/.github/workflows/build-fb-image.yaml +++ b/.github/workflows/build-fb-image.yaml @@ -18,7 +18,38 @@ permissions: packages: write jobs: + determine-tags: + runs-on: ubuntu-latest + name: Determine image tags + outputs: + IMAGE_BASE_TAG: ${{ steps.determine-tags.outputs.IMAGE_BASE_TAG }} + IMAGE_MAJOR_MINOR: ${{ steps.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + + steps: + - name: Determine image version tag + id: determine-tags + run: | + VERSION=${{ github.event.inputs.docker_tag_version }} + VERSION_WITHOUT_V=${VERSION#v} + MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) + + if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${VERSION}; then + echo "${VERSION} tag already exists, assuming we're building a patch release!" + LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${VERSION}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) + NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) + IMAGE_BASE_TAG="${VERSION}-${NEW_PATCH_VERSION}" + echo "Building patch release ${IMAGE_BASE_TAG}!" + else + echo "${VERSION} tag does not exist, assuming we're building a new release!" + IMAGE_BASE_TAG="${VERSION}" + fi + + echo "IMAGE_BASE_TAG=$IMAGE_BASE_TAG" >> $GITHUB_OUTPUT + echo "IMAGE_MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_OUTPUT + build-prod-image-metadata: + needs: + - determine-tags runs-on: ubuntu-latest name: Build prod image metadata outputs: @@ -31,35 +62,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - - name: Extract version parts - id: extract_version - run: | - VERSION=${{ github.event.inputs.docker_tag_version }} - VERSION_WITHOUT_V=${VERSION#v} - MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) - - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV - echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV - - - name: Determine image version tag - id: determine-tags - run: | - if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then - echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!" - LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) - NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) - IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}" - echo "Building patch release ${IMAGE_TAG}!" - else - echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!" - IMAGE_TAG="${{ env.VERSION }}" - fi - - echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV - env: - VERSION: ${{env.VERSION }} - name: docker metadata for building id: image-metadata @@ -68,13 +70,10 @@ jobs: images: "ghcr.io/${{ env.GITHUB_IMAGE }}" tags: | raw,latest - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: docker tags for cloning id: image-tags @@ -82,13 +81,10 @@ jobs: with: tags: | raw,latest - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: Set outputs id: set-outputs @@ -97,6 +93,8 @@ jobs: echo "DOCKER_IMG_NAME=${{env.DOCKER_REPO}}/${{ env.DOCKER_IMAGE }}" >> $GITHUB_OUTPUT build-debug-image-metadata: + needs: + - determine-tags runs-on: ubuntu-latest name: Build debug image metadata outputs: @@ -110,35 +108,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Extract version parts - id: extract_version - run: | - VERSION=${{ github.event.inputs.docker_tag_version }} - VERSION_WITHOUT_V=${VERSION#v} - MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) - - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV - echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV - - - name: Determine image version tag - id: determine-tags - run: | - if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-debug; then - echo "${{ env.VERSION }}-debug tag already exists, assuming we're building a patch release!" - LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) - NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) - IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}" - echo "Building patch release ${IMAGE_TAG}-debug!" - else - echo "${{ env.VERSION }}-debug tag does not exist, assuming we're building a new release!" - IMAGE_TAG="${{ env.VERSION }}" - fi - - echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV - env: - VERSION: ${{env.VERSION }} - - name: docker metadata id: image-metadata uses: docker/metadata-action@v5 @@ -148,13 +117,10 @@ jobs: latest=false suffix=-debug tags: | - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: docker tags for cloning id: image-tags @@ -164,13 +130,10 @@ jobs: latest=false suffix=-debug tags: | - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: Set outputs id: set-outputs @@ -293,7 +256,6 @@ jobs: source_registry: ghcr.io target_image: "${{ needs.build-prod-image-metadata.outputs.DOCKER_IMG_NAME }}" target_registry: docker.io - platforms: "['linux/arm64', 'linux/amd64']" tags: ${{ needs.build-prod-image-metadata.outputs.release_tags }} secrets: source_registry_username: ${{ github.actor }} @@ -313,7 +275,6 @@ jobs: source_registry: ghcr.io target_image: "${{ needs.build-debug-image-metadata.outputs.DOCKER_IMG_NAME }}" target_registry: docker.io - platforms: "['linux/arm64', 'linux/amd64']" tags: ${{ needs.build-debug-image-metadata.outputs.release_tags }} secrets: source_registry_username: ${{ github.actor }} diff --git a/.github/workflows/build-fd-image.yaml b/.github/workflows/build-fd-image.yaml index 3652a8730..15baf5c0e 100644 --- a/.github/workflows/build-fd-image.yaml +++ b/.github/workflows/build-fd-image.yaml @@ -18,51 +18,50 @@ permissions: packages: write jobs: - build-amd64-prod-image-metadata: + determine-tags: runs-on: ubuntu-latest - name: Build prod image metadata for amd64 + name: Determine image tags outputs: - IMG_NAME: ${{ steps.set-outputs.outputs.IMAGE_NAME }} - version: ${{ steps.image-metadata.outputs.version }} - tags: ${{ steps.image-metadata.outputs.tags }} - labels: ${{ steps.image-metadata.outputs.labels }} + IMAGE_BASE_TAG: ${{ steps.determine-tags.outputs.IMAGE_BASE_TAG }} + IMAGE_MAJOR_MINOR: ${{ steps.determine-tags.outputs.IMAGE_MAJOR_MINOR }} steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Extract version parts - id: extract_version + - name: Determine image version tag + id: determine-tags run: | VERSION=${{ github.event.inputs.docker_tag_version }} - VERSION_SUFFIX="amd64" VERSION_WITHOUT_V=${VERSION#v} MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV - echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV - echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV - - - name: Determine image version tag - id: determine-tags - run: | - if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then - echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!" - LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) + if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${VERSION}; then + echo "${VERSION} tag already exists, assuming we're building a patch release!" + LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${VERSION}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) - IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}" - echo "Building patch release ${IMAGE_TAG}-${{ env.VERSION_SUFFIX }}!" + IMAGE_BASE_TAG="${VERSION}-${NEW_PATCH_VERSION}" + echo "Building patch release ${IMAGE_BASE_TAG}!" else - echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag does not exist, assuming we're building a new release!" - IMAGE_TAG="${{ env.VERSION }}" + echo "${VERSION} tag does not exist, assuming we're building a new release!" + IMAGE_BASE_TAG="${VERSION}" fi - echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV - env: - VERSION: ${{env.VERSION }} - VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }} - + echo "IMAGE_BASE_TAG=$IMAGE_BASE_TAG" >> $GITHUB_OUTPUT + echo "IMAGE_MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_OUTPUT + + build-amd64-prod-image-metadata: + needs: + - determine-tags + runs-on: ubuntu-latest + name: Build prod image metadata for amd64 + outputs: + IMG_NAME: ${{ steps.set-outputs.outputs.IMAGE_NAME }} + version: ${{ steps.image-metadata.outputs.version }} + tags: ${{ steps.image-metadata.outputs.tags }} + labels: ${{ steps.image-metadata.outputs.labels }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: docker metadata for amd64 id: image-metadata uses: docker/metadata-action@v5 @@ -70,17 +69,13 @@ jobs: images: "ghcr.io/${{ env.GITHUB_IMAGE }}" flavor: | latest=false - suffix=-${{ env.VERSION_SUFFIX }} + suffix=-amd64 tags: | raw,latest - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} - VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: Set outputs id: set-outputs @@ -88,6 +83,8 @@ jobs: echo "IMAGE_NAME=${{ env.GITHUB_IMAGE }}" >> $GITHUB_OUTPUT build-arm64-prod-image-metadata: + needs: + - determine-tags runs-on: ubuntu-latest name: Build prod image metadata for arm64 outputs: @@ -99,38 +96,6 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Extract version parts - id: extract_version - run: | - VERSION=${{ github.event.inputs.docker_tag_version }} - VERSION_SUFFIX="arm64" - VERSION_WITHOUT_V=${VERSION#v} - MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) - - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV - echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV - echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV - - - name: Determine image version tag - id: determine-tags - run: | - if skopeo inspect --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then - echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!" - LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) - NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) - IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}" - echo "Building patch release ${IMAGE_TAG}-${{ env.VERSION_SUFFIX }}!" - else - echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag does not exist, assuming we're building a new release!" - IMAGE_TAG="${{ env.VERSION }}" - fi - - echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV - env: - VERSION: ${{ env.VERSION }} - VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }} - - name: docker metadata for arm64 id: image-metadata uses: docker/metadata-action@v5 @@ -138,17 +103,13 @@ jobs: images: "ghcr.io/${{ env.GITHUB_IMAGE }}" flavor: | latest=false - suffix=-${{ env.VERSION_SUFFIX }} + suffix=-arm64 tags: | raw,latest - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} - VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: Set outputs id: set-outputs @@ -156,6 +117,8 @@ jobs: echo "IMAGE_NAME=${{ env.GITHUB_IMAGE }}" >> $GITHUB_OUTPUT build-arm64-base-image-metadata: + needs: + - determine-tags runs-on: ubuntu-latest name: Build prod image metadata for arm64 base image outputs: @@ -168,39 +131,7 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - - name: Extract version parts - id: extract_version - run: | - VERSION=${{ github.event.inputs.docker_tag_version }} - VERSION_SUFFIX="arm64-base" - VERSION_WITHOUT_V=${VERSION#v} - MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) - - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_SUFFIX=$VERSION_SUFFIX" >> $GITHUB_ENV - echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV - echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV - - - name: Determine image version tag - id: determine-tags - run: | - if skopeo inspect --override-arch arm64 docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}-${{ env.VERSION_SUFFIX }}; then - echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag already exists, assuming we're building a patch release!" - LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) - NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) - IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}" - echo "Building patch release ${IMAGE_TAG}-${{ env.VERSION_SUFFIX }}!" - else - echo "${{ env.VERSION }}-${{ env.VERSION_SUFFIX }} tag does not exist, assuming we're building a new release!" - IMAGE_TAG="${{ env.VERSION }}" - fi - - echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV - env: - VERSION: ${{ env.VERSION }} - VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }} - + - name: docker metadata for arm64 base image id: image-metadata uses: docker/metadata-action@v5 @@ -208,16 +139,26 @@ jobs: images: "ghcr.io/${{ env.GITHUB_IMAGE }}" flavor: | latest=false - suffix=-${{ env.VERSION_SUFFIX }} + suffix=-arm64-base tags: | - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} - VERSION_SUFFIX: ${{ env.VERSION_SUFFIX }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + + - name: docker metadata for arm64 base image + id: image-tags + uses: docker/metadata-action@v5 + with: + flavor: | + latest=false + suffix=-arm64-base + tags: | + type=raw,value=latest + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: Set outputs id: set-outputs @@ -246,7 +187,7 @@ jobs: with: fetch-depth: 0 - - name: Login to Docker Hub + - name: Login to GHCR uses: docker/login-action@v3 with: registry: ghcr.io @@ -288,7 +229,7 @@ jobs: with: fetch-depth: 0 - - name: Login to Docker Hub + - name: Login to GHCR uses: docker/login-action@v3 with: registry: ghcr.io @@ -309,26 +250,6 @@ jobs: tags: ${{ needs.build-arm64-base-image-metadata.outputs.tags }} labels: ${{ needs.build-arm64-base-image-metadata.outputs.labels }} - release-arm64-base-image-to-docker-hub: - if: ${{ github.event_name != 'pull_request' }} - name: Release Image to Docker Hub - uses: ./.github/workflows/clone-docker-image-action.yaml - needs: - - build-arm64-base-image-metadata - - build-arm64-base - with: - source_image: "${{ needs.build-arm64-base-image-metadata.outputs.IMG_NAME }}" - source_registry: ghcr.io - target_image: "${{ needs.build-arm64-base-image-metadata.outputs.DOCKER_IMG_NAME }}" - target_registry: docker.io - platforms: "['linux/arm64']" - tags: ${{ needs.build-arm64-base-image-metadata.outputs.release_tags }} - secrets: - source_registry_username: ${{ github.actor }} - source_registry_token: ${{ secrets.GITHUB_TOKEN }} - target_registry_username: ${{ secrets.REGISTRY_USER }} - target_registry_token: ${{ secrets.REGISTRY_PASSWORD }} - build-arm64: runs-on: ubuntu-latest needs: @@ -379,6 +300,7 @@ jobs: prod-image-manifest: needs: + - determine-tags - build-amd64-prod-image-metadata - build-arm64-prod-image-metadata - build-amd64 @@ -399,46 +321,18 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract version parts - id: extract_version - run: | - VERSION=${{ github.event.inputs.docker_tag_version }} - VERSION_WITHOUT_V=${VERSION#v} - MAJOR_MINOR=$(echo $VERSION_WITHOUT_V | cut -d. -f1-2) - - echo "VERSION=$VERSION" >> $GITHUB_ENV - echo "VERSION_WITHOUT_V=$VERSION_WITHOUT_V" >> $GITHUB_ENV - echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV - - - name: Determine image version tag - id: determine-tags - run: | - if skopeo inspect docker://ghcr.io/${{ env.GITHUB_IMAGE }}:${{ env.VERSION }}; then - echo "${{ env.VERSION }} tag already exists, assuming we're building a patch release!" - LATEST_PATCH_VERSION=$(skopeo list-tags docker://ghcr.io/${{ env.GITHUB_IMAGE }} | grep -E "${{ env.VERSION }}-[0-9]+" | sort | uniq | tail -1 | tr -d \" | cut -d'-' -f2) - NEW_PATCH_VERSION=$((LATEST_PATCH_VERSION + 1)) - IMAGE_TAG="${{ env.VERSION }}-${NEW_PATCH_VERSION}" - echo "Building patch release ${IMAGE_TAG}!" - else - echo "${{ env.VERSION }} tag does not exist, assuming we're building a new release!" - IMAGE_TAG="${{ env.VERSION }}" - fi - - echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV - env: - VERSION: ${{ env.VERSION }} - + - name: docker metadata for manifest id: image-metadata uses: docker/metadata-action@v5 with: images: "ghcr.io/${{ env.GITHUB_IMAGE }}" tags: | - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} + type=raw,value=latest + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} env: IMAGE_TAG: ${{ env.IMAGE_TAG }} MAJOR_MINOR: ${{ env.MAJOR_MINOR }} @@ -448,13 +342,11 @@ jobs: uses: docker/metadata-action@v5 with: tags: | - type=raw,value=${{ env.IMAGE_TAG }} - type=raw,value=v${{ env.IMAGE_TAG }} - type=raw,value=${{ env.MAJOR_MINOR }} - type=raw,value=v${{ env.MAJOR_MINOR }} - env: - IMAGE_TAG: ${{ env.IMAGE_TAG }} - MAJOR_MINOR: ${{ env.MAJOR_MINOR }} + type=raw,value=latest + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_BASE_TAG }} + type=raw,value=${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} + type=raw,value=v${{ needs.determine-tags.outputs.IMAGE_MAJOR_MINOR }} - name: Set outputs id: set-outputs @@ -484,9 +376,28 @@ jobs: registry_username: ${{ github.actor }} registry_password: ${{ secrets.GITHUB_TOKEN }} + release-arm64-base-image-to-docker-hub: + if: ${{ github.event_name != 'pull_request' }} + name: Release arm64-base images to Docker Hub + uses: ./.github/workflows/clone-docker-image-action.yaml + needs: + - build-arm64-base-image-metadata + - build-arm64-base + with: + source_image: "${{ needs.build-arm64-base-image-metadata.outputs.IMG_NAME }}" + source_registry: ghcr.io + target_image: "${{ needs.build-arm64-base-image-metadata.outputs.DOCKER_IMG_NAME }}" + target_registry: docker.io + tags: ${{ needs.build-arm64-base-image-metadata.outputs.release_tags }} + secrets: + source_registry_username: ${{ github.actor }} + source_registry_token: ${{ secrets.GITHUB_TOKEN }} + target_registry_username: ${{ secrets.REGISTRY_USER }} + target_registry_token: ${{ secrets.REGISTRY_PASSWORD }} + release-images-to-docker-hub: if: ${{ github.event_name != 'pull_request' }} - name: Release Image to Docker Hub + name: Release images to Docker Hub uses: ./.github/workflows/clone-docker-image-action.yaml needs: - prod-image-manifest @@ -496,7 +407,6 @@ jobs: source_registry: ghcr.io target_image: "${{ needs.prod-image-manifest.outputs.DOCKER_IMG_NAME }}" target_registry: docker.io - platforms: "['linux/arm64', 'linux/amd64']" tags: ${{ needs.prod-image-manifest.outputs.release_tags }} secrets: source_registry_username: ${{ github.actor }} diff --git a/.github/workflows/clone-docker-image-action.yaml b/.github/workflows/clone-docker-image-action.yaml index 2f769e283..d3cf86a61 100644 --- a/.github/workflows/clone-docker-image-action.yaml +++ b/.github/workflows/clone-docker-image-action.yaml @@ -19,11 +19,11 @@ description: 'The target registry' required: true type: string - platforms: - description: 'The platforms to clone' - required: false - type: string - default: '["linux/arm64", "linux/amd64"]' + # platforms: + # description: 'The platforms to clone' + # required: false + # type: string + # default: '["linux/arm64", "linux/amd64"]' tags: description: 'The tags to apply to the target image' required: false @@ -43,25 +43,6 @@ required: true jobs: - check-image-exists: - strategy: - matrix: - platform: ${{ fromJson(inputs.platforms) }} - runs-on: ubuntu-latest - steps: - - name: Login to source container registry ${{ inputs.source_registry }} - uses: docker/login-action@v3 - with: - registry: ${{ inputs.source_registry }} - username: ${{ secrets.source_registry_username }} - password: ${{ secrets.source_registry_token }} - - - name: Pull the source image; verify it exists - run: - docker pull "$SOURCE_IMAGE" --platform=${{ matrix.platform }} - env: - SOURCE_IMAGE: ${{ inputs.source_registry }}/${{ inputs.source_image }} - shell: bash create-tags: runs-on: ubuntu-latest outputs: @@ -98,7 +79,6 @@ push-image: needs: - - check-image-exists - create-tags strategy: matrix: