From 065b8108428c0afa866e70fbf7cb9f1f06cefde9 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Mon, 14 Nov 2022 11:46:38 +0100 Subject: [PATCH] Bump to Fedora 37 This gives us Go 1.19. file is no longer installed by default; test/scripts/compile/test.sh relies on it so we need to install it explicitly. unzip is no longer installed by default; it's required for protoc-gen in the Submariner project. Signed-off-by: Stephen Kitt --- package/Dockerfile.shipyard-dapper-base | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/Dockerfile.shipyard-dapper-base b/package/Dockerfile.shipyard-dapper-base index f9563f50e..9dc699fa2 100644 --- a/package/Dockerfile.shipyard-dapper-base +++ b/package/Dockerfile.shipyard-dapper-base @@ -1,4 +1,4 @@ -FROM fedora:36 +FROM fedora:37 # Unless specified otherwise, compress to a medium level which gives (from experemintation) a # good balance between compression time and resulting image size. @@ -14,6 +14,7 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l # Component | Usage # ------------------------------------------------------------- # curl | download other tools +# file | file identification (in compile/test.sh) # findutils | make unit (find unit test dirs) # gcc | needed by `go test -race` (https://github.com/golang/go/issues/27089) # gh | backport, releases @@ -33,6 +34,7 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l # python3-setuptools | Needed by j2cli # qemu-user-static | Emulation (for multiarch builds) # skopeo | container image manipulation +# unzip | ZIP extraction # upx | binary compression # yq | YAML processing (OCM deploy tool) @@ -45,7 +47,7 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l RUN dnf -y install --nodocs --setopt=install_weak_deps=False \ gcc git-core curl moby-engine make golang kubernetes-client \ findutils moreutils upx jq gitlint python3-setuptools \ - qemu-user-static python3-pip skopeo && \ + qemu-user-static python3-pip skopeo file unzip && \ pip install j2cli[yaml] --user && \ rpm -e --nodeps containerd python3-pip && \ rpm -qa "selinux*" | xargs -r rpm -e --nodeps && \