From d4a8598ca44b67103a23bcccac2ed13ed263b115 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Mon, 9 Jun 2025 14:39:25 -0500 Subject: [PATCH] make validate-in-container changes changing the validate-in-container make target to use quay.io/libpod/validatepr:latest. this allows `make validate` to run to completion doing linting, ed's perl checks, and pre-commit.] The image is now based on F42 `awk` is not part of the base image, so I added `awk`. Signed-off-by: Brent Baude --- Makefile | 2 +- contrib/validatepr/Containerfile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e0df5a0734..4039439cd0 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,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.22 \ + quay.io/libpod/validatepr:latest \ make $(*) diff --git a/contrib/validatepr/Containerfile b/contrib/validatepr/Containerfile index 5eba4c8fbe..dde52ee607 100644 --- a/contrib/validatepr/Containerfile +++ b/contrib/validatepr/Containerfile @@ -3,15 +3,15 @@ FROM registry.fedoraproject.org/fedora:latest WORKDIR /go/src/github.com/containers/podman RUN dnf install -y systemd-devel \ + awk \ + btrfs-progs-devel \ + git \ + golang \ + gpgme-devel \ libassuan-devel \ libseccomp-devel \ - gpgme-devel \ - device-mapper-devel \ - btrfs-progs-devel \ - golang \ make \ man-db \ - git \ perl-Clone \ perl-FindBin \ - pre-commit && dnf clean all + pre-commit && dnf clean all