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

Add support for multi-arch docker images #399

Merged
merged 14 commits into from
Jun 28, 2024
Merged

Add support for multi-arch docker images #399

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c576c6
Don't hardcode CPU architecture in dockerfile
yuvipanda Oct 19, 2022
d69c208
Build conda lock files for amd64, aarch64 & ppcle64
yuvipanda Oct 19, 2022
fb94a8f
[condalock-command] autogenerated conda-lock files
pangeo-bot Oct 19, 2022
b941a1d
Dynamically pick conda-lock file based on architecture
yuvipanda Oct 19, 2022
25cef13
Generate multi-arch lock files in Makefile
yuvipanda Oct 19, 2022
5f34442
merge main
scottyhq Jun 4, 2024
9d2802e
tidy dockerfile and make, comment out arm-incompatible packages
scottyhq Jun 4, 2024
0db80af
Merge branch 'master' into uname
scottyhq Jun 26, 2024
4f25c69
Update pangeo-notebook/environment.yml
scottyhq Jun 27, 2024
0642772
Update .github/workflows/CondaLock.yml
scottyhq Jun 27, 2024
511947a
miniforge3 not mambaforge
scottyhq Jun 27, 2024
ac916f0
multiarch cmds in makefile and github actions
scottyhq Jun 27, 2024
d96bc35
Test multiarch
scottyhq Jun 27, 2024
38c293e
Apply suggestions from code review
scottyhq Jun 28, 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
5 changes: 5 additions & 0 deletions .github/workflows/Test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ jobs:
sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc
df -h
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
Comment on lines +45 to +46
Copy link
Member

Choose a reason for hiding this comment

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

following https://docs.docker.com/build/ci/github-actions/multi-platform/.

Copy link
Member

Choose a reason for hiding this comment

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

Yep, will need to use virtualization, until someone can pay us to use native arm64 runners (https://github.blog/changelog/2024-06-24-github-actions-ubuntu-24-04-image-now-available-for-arm64-runners) 🙂


- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
Expand All @@ -51,6 +54,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: base-image
platforms: linux/amd64,linux/arm64
tags: localhost:5000/pangeo/base-image:PR
push: true
cache-from: type=gha
Expand All @@ -60,6 +64,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: ${{ matrix.IMAGE }}
platforms: linux/amd64,linux/arm64
push: true
tags: localhost:5000/${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:PR
build-args: PANGEO_BASE_IMAGE_TAG=PR
Expand Down