Skip to content

Commit

Permalink
Bump to Fedora 37
Browse files Browse the repository at this point in the history
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 <skitt@redhat.com>
  • Loading branch information
skitt authored and tpantelis committed Jan 31, 2024
1 parent e8c619a commit 065b810
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions package/Dockerfile.shipyard-dapper-base
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand All @@ -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)

Expand All @@ -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 && \
Expand Down

0 comments on commit 065b810

Please sign in to comment.