Restored Ubuntu 22.04 arm64v8

python-pillow · Apr 27, 2024 · 05a6ad5 · 05a6ad5
1 parent c488621
commit 05a6ad5
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 63 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         image:
           # Run slower jobs first to give them a headstart and reduce waiting time
-          - "ubuntu-24.04-noble-arm64v8"
+          - "ubuntu-22.04-jammy-arm64v8"
           - "ubuntu-24.04-noble-ppc64le"
           - "ubuntu-24.04-noble-s390x"
           # test image for manylinux-wheel build
@@ -44,7 +44,7 @@ jobs:
             test-image: "ubuntu-24.04-noble-amd64"
           - image: "manylinux_2_28-wheel-build"
             test-image: "ubuntu-24.04-noble-amd64"
-          - image: "ubuntu-24.04-noble-arm64v8"
+          - image: "ubuntu-22.04-jammy-arm64v8"
             qemu-arch: "aarch64"
           - image: "ubuntu-24.04-noble-ppc64le"
             qemu-arch: "ppc64le"

diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ TARGETS = \
 	ubuntu-22.04-jammy-amd64 \
 	ubuntu-24.04-noble-amd64 \
 	ubuntu-24.04-noble-amd64-valgrind \
-	ubuntu-24.04-noble-arm64v8 \
+	ubuntu-22.04-jammy-arm64v8 \
 	ubuntu-24.04-noble-ppc64le \
 	ubuntu-24.04-noble-s390x
 

diff --git a/...ive/ubuntu-22.04-jammy-arm64v8/Dockerfile → ubuntu-22.04-jammy-arm64v8/Dockerfile b/...ive/ubuntu-22.04-jammy-arm64v8/Dockerfile → ubuntu-22.04-jammy-arm64v8/Dockerfile
@@ -31,7 +31,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     zlib1g-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN useradd pillow \
+RUN useradd --uid 1001 pillow \
     && addgroup pillow sudo \
     && mkdir /home/pillow \
     && chown pillow:pillow /home/pillow

diff --git a/archive/ubuntu-22.04-jammy-arm64v8/Makefile → ubuntu-22.04-jammy-arm64v8/Makefile b/archive/ubuntu-22.04-jammy-arm64v8/Makefile → ubuntu-22.04-jammy-arm64v8/Makefile
diff --git a/archive/ubuntu-22.04-jammy-arm64v8/test.sh → ubuntu-22.04-jammy-arm64v8/test.sh b/archive/ubuntu-22.04-jammy-arm64v8/test.sh → ubuntu-22.04-jammy-arm64v8/test.sh
diff --git a/archive/ubuntu-22.04-jammy-arm64v8/update.sh → ubuntu-22.04-jammy-arm64v8/update.sh b/archive/ubuntu-22.04-jammy-arm64v8/update.sh → ubuntu-22.04-jammy-arm64v8/update.sh
diff --git a/ubuntu-24.04-noble-arm64v8/Dockerfile b/ubuntu-24.04-noble-arm64v8/Dockerfile
diff --git a/ubuntu-24.04-noble-arm64v8/Makefile b/ubuntu-24.04-noble-arm64v8/Makefile
diff --git a/ubuntu-24.04-noble-arm64v8/test.sh b/ubuntu-24.04-noble-arm64v8/test.sh
diff --git a/ubuntu-24.04-noble-arm64v8/update.sh b/ubuntu-24.04-noble-arm64v8/update.sh