Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes fluentd/fluent-bit image build CI workflows #1259

Merged
merged 24 commits into from
Jul 25, 2024
Merged

Fixes fluentd/fluent-bit image build CI workflows #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
78bd883
Re-factor.
joshuabaird Jul 22, 2024
7e227d8
Re-factor.
joshuabaird Jul 22, 2024
ad4acaa
Re-factor.
joshuabaird Jul 22, 2024
1a3ec14
Re-factor.
joshuabaird Jul 22, 2024
6eb2347
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
335c204
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
4db78eb
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
b577932
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
e1ca516
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
86fb076
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
0d27466
Skip arm64 builds for now.
joshuabaird Jul 22, 2024
297556c
Add arm64-base back in.
joshuabaird Jul 23, 2024
5ca9911
Fix tags.
joshuabaird Jul 23, 2024
3cf6143
Remove check-image.
joshuabaird Jul 23, 2024
a64bc0c
Remove check.
joshuabaird Jul 23, 2024
1d724cf
Remove check.
joshuabaird Jul 23, 2024
a4df62a
Remove check.
joshuabaird Jul 23, 2024
89438e9
Add tags back.
joshuabaird Jul 23, 2024
25d04c9
Add tags back.
joshuabaird Jul 23, 2024
efe67b2
Add tags back.
joshuabaird Jul 23, 2024
3316ad1
Add tags back.
joshuabaird Jul 23, 2024
ad92c31
Remove check image.
joshuabaird Jul 24, 2024
2ab2a86
Remove platform from fb.
joshuabaird Jul 24, 2024
8efa7d8
Remove platform from fb.
joshuabaird Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 49 additions & 88 deletions .github/workflows/build-fb-image.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -68,27 +70,21 @@ 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
uses: docker/metadata-action@v5
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
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
Loading