Skip to content
This repository has been archived by the owner on Jun 13, 2023. It is now read-only.

Arm64 amd64 images #52

Closed
wants to merge 12 commits into from
Closed

Arm64 amd64 images #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
162b1b5
Updated CI workflow to add manual build for arm image
arpita0911patel Apr 27, 2023
e11b99f
Merge branch 'main' of https://github.com/arpita0911patel/CloudInfra
arpita0911patel Apr 27, 2023
bdce97a
Added set up QEMU and buildx
arpita0911patel Apr 27, 2023
67d5319
Seperate arm and x86 manual build flow
arpita0911patel Apr 27, 2023
f1e2595
Build image with latest and latest_arm tags
arpita0911patel Apr 28, 2023
9b16d8d
added buildx for multiarch and keeping image tag as latest
arpita0911patel Apr 28, 2023
8a2f2d1
Revert "Added set up QEMU and buildx"
arpita0911patel Apr 28, 2023
ecf1731
Revert "Revert "Added set up QEMU and buildx""
arpita0911patel Apr 28, 2023
ab7922a
Revert "added buildx for multiarch and keeping image tag as latest"
arpita0911patel Apr 28, 2023
1b7bf37
Revert "Build image with latest and latest_arm tags"
arpita0911patel Apr 28, 2023
1b5346a
Updated repo and tag name
arpita0911patel Apr 28, 2023
c3c3f79
Updated CI workflow for main branch (arm image)
arpita0911patel Apr 28, 2023
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
6 changes: 3 additions & 3 deletions .github/action_templates/build-and-push/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ runs:
echo "${{ inputs.docker-auth-token }}" | docker login --username awiciroh --password-stdin
- name: Build and tag Docker image
shell: bash
run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest docker/.
run: docker build -t awiciroh/ciroh-ngen-image:${{ inputs.github-sha }} -t awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }} docker/.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this build step is where you want to use QEMU and then provide the --platform flag to the build so it can build either one...

- name: Push Docker image
shell: bash
run: |
docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:${{ inputs.github-sha }}
docker push awiciroh/ciroh-ngen-image-${{ inputs.image-platform }}:latest
docker push awiciroh/ciroh-ngen-image:${{ inputs.github-sha }}
docker push awiciroh/ciroh-ngen-image:latest-${{ inputs.image-platform }}
8 changes: 7 additions & 1 deletion .github/workflows/arm_docker_build.yml → ...orkflows/docker_image_main_branch_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ on:
- docker/**
jobs:
build-and-push:
runs-on: macos-latest
runs-on: ubuntu-latest
steps:
- name: deploy
uses: actions/checkout@v2
- name: Set up QEMU
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think buildx is building an actual arm image. Since the build-and-push action runs on ubuntu (amd64), just having QEMU ready isn't enough, buildx has to know to build for that platform and work with QEMU. What is actually happening here is buildx is building for the native platform (amd64) and adding the arm platfrom tag.

uses: docker/setup-qemu-action@v2
with:
platforms: 'arm64,arm'
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push ARM Docker image for NGEN
uses: ./.github/action_templates/build-and-push
with:
Expand Down
2 changes: 1 addition & 1 deletion ...ub/workflows/docker_image_main_branch.yml → ...orkflows/docker_image_main_branch_x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build and Push Docker image to Docker Hub
name: Build and Push x86 Docker image to Docker Hub
on:
push:
branches: [ main ]
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/docker_image_manual_build_arm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Manual Build and Push ARM Docker image to Docker Hub
on:
workflow_dispatch:
jobs:
build-and-push:
runs-on: ubuntu-latest
steps:
- name: deploy
uses: actions/checkout@v2
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
with:
platforms: 'arm64,arm'
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Build and push Docker image
uses: ./.github/action_templates/build-and-push
with:
docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
github-sha: ${{ github.sha }}
image-platform: "arm"
10 changes: 2 additions & 8 deletions ...b/workflows/docker_image_manual_build.yml → ...rkflows/docker_image_manual_build_x86.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Manual Build and Push Docker image to Docker Hub
name: Manual Build and Push x86 Docker image to Docker Hub
on:
workflow_dispatch:
jobs:
Expand All @@ -12,10 +12,4 @@ jobs:
with:
docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
github-sha: ${{ github.sha }}
image-platform: "x86"
- name: Build and push Docker image for arm
uses: ./.github/action_templates/build-and-push
with:
docker-auth-token: ${{ secrets.DOCKER_AUTH_TOKEN }}
github-sha: ${{ github.sha }}
image-platform: "arm"
image-platform: "x86"