Restored Ubuntu 22.04 amd64 valgrind

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

Hide file tree

Showing 18 changed files with 3 additions and 204 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
           - "gentoo"
           - "ubuntu-20.04-focal-amd64"
           - "ubuntu-22.04-jammy-amd64"
-          - "ubuntu-24.04-noble-amd64-valgrind"
+          - "ubuntu-22.04-jammy-amd64-valgrind"
           # has a dependency on the test image
           - "manylinux2014-wheel-build"
           - "manylinux_2_28-wheel-build"

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

diff --git a/...ntu-22.04-jammy-amd64-valgrind/Dockerfile → ubuntu-22.04-jammy-amd64-valgrind/Dockerfile b/...ntu-22.04-jammy-amd64-valgrind/Dockerfile → ubuntu-22.04-jammy-amd64-valgrind/Dockerfile
@@ -33,7 +33,7 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     valgrind \
     && apt-get clean && 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/...22.04-jammy-amd64-valgrind/Dockerfile-dbg → ...22.04-jammy-amd64-valgrind/Dockerfile-dbg b/...22.04-jammy-amd64-valgrind/Dockerfile-dbg → ...22.04-jammy-amd64-valgrind/Dockerfile-dbg
diff --git a/...buntu-22.04-jammy-amd64-valgrind/Makefile → ubuntu-22.04-jammy-amd64-valgrind/Makefile b/...buntu-22.04-jammy-amd64-valgrind/Makefile → ubuntu-22.04-jammy-amd64-valgrind/Makefile
diff --git a/...-22.04-jammy-amd64-valgrind/README-dbg.md → ...-22.04-jammy-amd64-valgrind/README-dbg.md b/...-22.04-jammy-amd64-valgrind/README-dbg.md → ...-22.04-jammy-amd64-valgrind/README-dbg.md
diff --git a/...tu-22.04-jammy-amd64-valgrind/python.supp → ...tu-22.04-jammy-amd64-valgrind/python.supp b/...tu-22.04-jammy-amd64-valgrind/python.supp → ...tu-22.04-jammy-amd64-valgrind/python.supp
diff --git a/...buntu-22.04-jammy-amd64-valgrind/setup.sh → ubuntu-22.04-jammy-amd64-valgrind/setup.sh b/...buntu-22.04-jammy-amd64-valgrind/setup.sh → ubuntu-22.04-jammy-amd64-valgrind/setup.sh
diff --git a/...ubuntu-22.04-jammy-amd64-valgrind/test.sh → ubuntu-22.04-jammy-amd64-valgrind/test.sh b/...ubuntu-22.04-jammy-amd64-valgrind/test.sh → ubuntu-22.04-jammy-amd64-valgrind/test.sh
diff --git a/...untu-22.04-jammy-amd64-valgrind/update.sh → ubuntu-22.04-jammy-amd64-valgrind/update.sh b/...untu-22.04-jammy-amd64-valgrind/update.sh → ubuntu-22.04-jammy-amd64-valgrind/update.sh
diff --git a/ubuntu-24.04-noble-amd64-valgrind/Dockerfile b/ubuntu-24.04-noble-amd64-valgrind/Dockerfile
diff --git a/ubuntu-24.04-noble-amd64-valgrind/Dockerfile-dbg b/ubuntu-24.04-noble-amd64-valgrind/Dockerfile-dbg
diff --git a/ubuntu-24.04-noble-amd64-valgrind/Makefile b/ubuntu-24.04-noble-amd64-valgrind/Makefile
diff --git a/ubuntu-24.04-noble-amd64-valgrind/README-dbg.md b/ubuntu-24.04-noble-amd64-valgrind/README-dbg.md
diff --git a/ubuntu-24.04-noble-amd64-valgrind/python.supp b/ubuntu-24.04-noble-amd64-valgrind/python.supp
diff --git a/ubuntu-24.04-noble-amd64-valgrind/setup.sh b/ubuntu-24.04-noble-amd64-valgrind/setup.sh
diff --git a/ubuntu-24.04-noble-amd64-valgrind/test.sh b/ubuntu-24.04-noble-amd64-valgrind/test.sh
diff --git a/ubuntu-24.04-noble-amd64-valgrind/update.sh b/ubuntu-24.04-noble-amd64-valgrind/update.sh