Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Provide protoc in the base image #1764

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Provide protoc in the base image #1764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51e1647
Split and sort RPM packages, update docs
skitt Dec 4, 2024
50157e0
Provide protoc in the base image
skitt Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 27 additions & 11 deletions package/Dockerfile.shipyard-dapper-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,18 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l
# findutils | make unit (find unit test dirs)
# gcc | needed by `go test -race` (https://github.com/golang/go/issues/27089)
# gh | backport, releases
# git | find the workspace root
# git-core | find the workspace root, git clones
# golang | build
# golangci-lint | code linting
# helm | e2e tests
# jq | JSON processing (GitHub API)
# kind | e2e tests
# kube-ps1 | print out kube context in dapper shell
# kubectl | e2e tests (in kubernetes-client)
# make | OLM installation
# kubernetes-client | kubectl, used in e2e tests
# make | builds
# moby-engine | Docker (for Dapper)
# moreutils | sponge (for system tests)
# pip | Python package installation
# procps-ng | watch (for installing ACM)
# protobuf-compiler | protobuf compilation
# python3-jinja2-cli | Jinja2 template engine (used by OVN's kind setup script)
# qemu-user-static | Emulation (for multiarch builds)
# qemu-user-static-* | Emulation (for multiarch builds)
# skopeo | container image manipulation
# unzip | ZIP extraction
# upx | binary compression
Expand All @@ -43,10 +41,28 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} PATH=/go/bin:/root/.l
# - DNF cache
# - Any unnecessary packages and executables
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 procps-ng pip \
curl \
file \
findutils \
gcc \
gh \
git-core \
gitlint \
golang \
jq \
kubernetes-client \
make \
moby-engine \
moreutils \
pip \
procps-ng \
protobuf-compiler \
python3-jinja2-cli \
qemu-user-static-aarch64 qemu-user-static-x86 \
python3-jinja2-cli skopeo file unzip gh yq && \
skopeo \
unzip \
upx \
yq && \
rpm -e --nodeps containerd && \
rpm -qa "selinux*" | xargs -r rpm -e --nodeps && \
dnf -y clean all && \
Expand Down
Loading