diff --git a/Makefile b/Makefile index 442e3a99cf..b6fc224aac 100644 --- a/Makefile +++ b/Makefile @@ -350,7 +350,7 @@ $(IN_CONTAINER): %-in-container: $(PODMANCMD) run --rm --env HOME=/root \ -v $(CURDIR):/src -w /src \ --security-opt label=disable \ - docker.io/library/golang:1.20 \ + docker.io/library/golang:1.22 \ make $(*) diff --git a/go.mod b/go.mod index cd3feab6ff..fa6e32ddce 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/checkpoint-restore/checkpointctl v1.1.0 github.com/checkpoint-restore/go-criu/v7 v7.1.0 github.com/containernetworking/plugins v1.4.0 - github.com/containers/buildah v1.35.1-0.20240412112838-e393e57728f5 + github.com/containers/buildah v1.35.1-0.20240425012436-fc18157da3a1 github.com/containers/common v0.58.1-0.20240419143618-deb3eeef3b74 github.com/containers/conmon v2.0.20+incompatible github.com/containers/gvisor-tap-vsock v0.7.4-0.20240408151405-d744d71db363 diff --git a/go.sum b/go.sum index 62d6f7d7f8..c59e89f2b9 100644 --- a/go.sum +++ b/go.sum @@ -80,8 +80,8 @@ github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl3 github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= github.com/containernetworking/plugins v1.4.0 h1:+w22VPYgk7nQHw7KT92lsRmuToHvb7wwSv9iTbXzzic= github.com/containernetworking/plugins v1.4.0/go.mod h1:UYhcOyjefnrQvKvmmyEKsUA+M9Nfn7tqULPpH0Pkcj0= -github.com/containers/buildah v1.35.1-0.20240412112838-e393e57728f5 h1:ucOnAzlQRjgDogeTTByJ45E1fW/On2CYc1WH4XmcHkQ= -github.com/containers/buildah v1.35.1-0.20240412112838-e393e57728f5/go.mod h1:unO5wyQXGHXcDBFu0D+W3bUXvfQrMEh1J6a8dgX8F+4= +github.com/containers/buildah v1.35.1-0.20240425012436-fc18157da3a1 h1:Qza4/6SPoIO/vR2wvSiYo3kst52dWUST0ZJG3L4ppYs= +github.com/containers/buildah v1.35.1-0.20240425012436-fc18157da3a1/go.mod h1:unO5wyQXGHXcDBFu0D+W3bUXvfQrMEh1J6a8dgX8F+4= github.com/containers/common v0.58.1-0.20240419143618-deb3eeef3b74 h1:3o+wybYKyr03hlrNdZGDjV8ukVTU2JXttzAVk9OmRLg= github.com/containers/common v0.58.1-0.20240419143618-deb3eeef3b74/go.mod h1:AnMTrXjygOD8jQKNBae4EEjKLlED9Svysh98Be+MktM= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index df61366404..5dae5dfc75 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -134,9 +134,7 @@ errmsg "non-directory/Dockerfile: not a directory" \ "bud with a path to a Dockerfile (-f) containing a non-directory entry" errmsg "no such file or directory" \ - "Error: context must be a directory:" \ - "bud with dir for file but no Dockerfile in dir" \ - "bud with bad dir Dockerfile" + "Error: context must be a directory:" errmsg "no such file or directory" \ "Error: no context directory and no Containerfile specified" \ @@ -144,11 +142,11 @@ errmsg "no such file or directory" \ errmsg "is not a file" \ "Error: no Containerfile or Dockerfile specified or found in context directory" \ - "bud with specified context should fail if assumed Dockerfile is a directory" + "bud with specified context should fail if Dockerfile in context directory is actually a file" errmsg "no such file or directory" \ "context must be a directory" \ - "bud with specified context should fail if context contains not-existing Dockerfile" + "bud with specified context should fail if context directory does not exist" # 2022-04-26 after buildah PR 3926 (where Ed added error-message checks" errmsg "no FROM statement found" \ diff --git a/test/buildah-bud/buildah-tests.diff b/test/buildah-bud/buildah-tests.diff index f8029493ad..481e99bfd8 100644 --- a/test/buildah-bud/buildah-tests.diff +++ b/test/buildah-bud/buildah-tests.diff @@ -1,4 +1,4 @@ -From 716a55e6ce36c30df4dc9cde3d1b43b8c7d19c9e Mon Sep 17 00:00:00 2001 +From 09b115ea501320bde7cf979f280f42dc803aa70b Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Thu, 6 Oct 2022 17:32:59 -0600 Subject: [PATCH] tweaks for running buildah tests under podman @@ -9,12 +9,12 @@ Signed-off-by: Ed Santiago 1 file changed, 115 insertions(+), 4 deletions(-) diff --git a/tests/helpers.bash b/tests/helpers.bash -index 349145f29..3a0348f0b 100644 +index f4245c8bc..8df18c0cc 100644 --- a/tests/helpers.bash +++ b/tests/helpers.bash -@@ -70,6 +70,38 @@ EOF - ROOTDIR_OPTS="--root ${TEST_SCRATCH_DIR}/root --runroot ${TEST_SCRATCH_DIR}/runroot --storage-driver ${STORAGE_DRIVER}" +@@ -71,6 +71,38 @@ EOF BUILDAH_REGISTRY_OPTS="--registries-conf ${TEST_SOURCES}/registries.conf --registries-conf-dir ${TEST_SCRATCH_DIR}/registries.d --short-name-alias-conf ${TEST_SCRATCH_DIR}/cache/shortnames.conf" + COPY_REGISTRY_OPTS="--registries-conf ${TEST_SOURCES}/registries.conf --registries-conf-dir ${TEST_SCRATCH_DIR}/registries.d --short-name-alias-conf ${TEST_SCRATCH_DIR}/cache/shortnames.conf" PODMAN_REGISTRY_OPTS="--registries-conf ${TEST_SOURCES}/registries.conf" + + PODMAN_SERVER_PID= @@ -51,7 +51,7 @@ index 349145f29..3a0348f0b 100644 } function starthttpd() { -@@ -113,6 +145,32 @@ function teardown_tests() { +@@ -114,6 +146,32 @@ function teardown_tests() { stop_git_daemon stop_registry @@ -84,7 +84,7 @@ index 349145f29..3a0348f0b 100644 # Workaround for #1991 - buildah + overlayfs leaks mount points. # Many tests leave behind /var/tmp/.../root/overlay and sub-mounts; # let's find those and clean them up, otherwise 'rm -rf' fails. -@@ -202,7 +260,12 @@ function copy() { +@@ -203,7 +261,12 @@ function copy() { } function podman() { @@ -98,7 +98,7 @@ index 349145f29..3a0348f0b 100644 } # There are various scenarios where we would like to execute `tests` as rootless user, however certain commands like `buildah mount` -@@ -266,8 +329,36 @@ function run_buildah() { +@@ -267,8 +330,36 @@ function run_buildah() { --retry) retry=3; shift;; # retry network flakes esac @@ -136,7 +136,7 @@ index 349145f29..3a0348f0b 100644 # If session is rootless and `buildah mount` is invoked, perform unshare, # since normal user cannot mount a filesystem unless they're in a user namespace along with its own mount namespace. -@@ -281,8 +372,8 @@ function run_buildah() { +@@ -282,8 +373,8 @@ function run_buildah() { retry=$(( retry - 1 )) # stdout is only emitted upon error; this echo is to help a debugger @@ -147,7 +147,7 @@ index 349145f29..3a0348f0b 100644 # without "quotes", multiple lines are glommed together into one if [ -n "$output" ]; then echo "$output" -@@ -621,6 +712,26 @@ function skip_if_no_docker() { +@@ -644,6 +735,26 @@ function skip_if_no_unshare() { fi } @@ -175,5 +175,5 @@ index 349145f29..3a0348f0b 100644 daemondir=${TEST_SCRATCH_DIR}/git-daemon mkdir -p ${daemondir}/repo -- -2.39.2 +2.44.0 diff --git a/vendor/github.com/containers/buildah/.cirrus.yml b/vendor/github.com/containers/buildah/.cirrus.yml index 1d28a84403..6dd95ed381 100644 --- a/vendor/github.com/containers/buildah/.cirrus.yml +++ b/vendor/github.com/containers/buildah/.cirrus.yml @@ -164,7 +164,7 @@ unit_task: - vendor - cross_build - timeout_in: 1h + timeout_in: 90m matrix: - env: diff --git a/vendor/github.com/containers/buildah/.packit.yaml b/vendor/github.com/containers/buildah/.packit.yaml index 76b297c14a..c63311c8cb 100644 --- a/vendor/github.com/containers/buildah/.packit.yaml +++ b/vendor/github.com/containers/buildah/.packit.yaml @@ -22,8 +22,8 @@ jobs: - fedora-eln-aarch64 - centos-stream+epel-next-8-x86_64 - centos-stream+epel-next-8-aarch64 - - centos-stream+epel-next-9-x86_64 - - centos-stream+epel-next-9-aarch64 + - epel-9-x86_64 + - epel-9-aarch64 additional_repos: - "copr://rhcontainerbot/podman-next" diff --git a/vendor/modules.txt b/vendor/modules.txt index c5f6feb539..9eca503136 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -141,7 +141,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.4.0 ## explicit; go 1.20 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.35.1-0.20240412112838-e393e57728f5 +# github.com/containers/buildah v1.35.1-0.20240425012436-fc18157da3a1 ## explicit; go 1.20 github.com/containers/buildah github.com/containers/buildah/bind