Skip to content

Commit baec499

Browse files
committed
gh: Try to fix Docker builds on arm
1 parent 6204b2a commit baec499

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

.github/workflows/build_docker.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,6 @@ jobs:
2424
use_cuda: "ON"
2525
tag_suffix: "-cuda12.8"
2626
steps:
27-
- name: Free up disk space
28-
run: |
29-
# Remove specific Docker images that are no longer needed
30-
docker rmi $(docker images -f "dangling=true" -q) || true
31-
32-
# Prune unused Docker objects (images, containers, volumes, and networks)
33-
docker system prune -f || true
34-
35-
# Clean up specific directories known to consume a lot of space
36-
sudo apt-get clean
37-
sudo rm -rf /var/lib/apt/lists/*
38-
npm cache clean --force || true
39-
40-
# Show disk space usage
41-
df -h
42-
4327
- name: Extract Docker metadata
4428
id: meta
4529
uses: docker/metadata-action@v5
@@ -54,10 +38,12 @@ jobs:
5438
type=edge
5539
5640
- name: Set up QEMU
57-
uses: docker/setup-qemu-action@v2
41+
uses: docker/setup-qemu-action@v3
42+
with:
43+
platforms: linux/amd64,linux/arm64
5844

5945
- name: Set up Docker Buildx
60-
uses: docker/setup-buildx-action@v2
46+
uses: docker/setup-buildx-action@v3
6147

6248
- name: Login to GitHub Container Registry
6349
if: github.event_name != 'pull_request'
@@ -68,7 +54,7 @@ jobs:
6854
password: ${{ secrets.GITHUB_TOKEN }}
6955

7056
- name: Build and push
71-
uses: docker/build-push-action@v3
57+
uses: docker/build-push-action@v6
7258
with:
7359
build-args: |
7460
BASE_IMAGE=${{ matrix.base_image }}

apptainer/pgs-recon.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ From: {{ BASE_IMAGE }}
9999
# Activate virtualenv
100100
. /usr/local/educelab/pgs-recon/.venv/bin/activate
101101
# Update pip
102-
python3 -m pip install --upgrade pip wheel
102+
python3 -m pip install --upgrade pip setuptools wheel
103103

104104
# Install PGSRecon
105105
python3 -m pip install --editable /usr/local/educelab/pgs-recon

0 commit comments

Comments
 (0)