Skip to content

OCPBUGS-20097: Migrate tools image to RHEL9 #1652

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 22, 2024
Merged

OCPBUGS-20097: Migrate tools image to RHEL9 #1652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion images/recycler/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/4.11:cli
FROM registry.ci.openshift.org/ocp/4.16:cli

@joepvd joepvd Apr 3, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This dockerfile is not used in production builds

@soltysh soltysh Apr 3, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I bet some should be cleaned up


LABEL io.k8s.display-name="OpenShift Volume Recycler" \
io.k8s.description="This is a component of OpenShift and is used to prepare persistent volumes for reuse after they are deleted." \
Expand Down
18 changes: 13 additions & 5 deletions images/tools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
FROM registry.ci.openshift.org/ocp/4.16:cli
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
WORKDIR /go/src/github.com/openshift/oc
COPY . .
RUN make build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
COPY --from=builder /go/src/github.com/openshift/oc/oc /usr/bin/

@joepvd joepvd Apr 3, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a FROM missing here

@soltysh soltysh Apr 3, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch - fixed.

RUN for i in kubectl openshift-deploy openshift-docker-build openshift-sti-build openshift-git-clone openshift-manage-dockerfile openshift-extract-image-content openshift-recycle; do ln -sf /usr/bin/oc /usr/bin/$i; done
RUN INSTALL_PKGS="\
bash-completion \
bc \
Expand All @@ -8,6 +15,7 @@ RUN INSTALL_PKGS="\
e2fsprogs \
ethtool \
file \
fio \
git \
glibc-utils \
gzip \
Expand All @@ -18,26 +26,25 @@ RUN INSTALL_PKGS="\
jq \
less \
ltrace \
mailx \
net-tools \
nmap-ncat \
parted \
pciutils \
procps-ng \
psmisc \
perf \
python3 \
sos \
s-nail \
strace \
stress-ng \
sysstat \
tcpdump \
tmux \
util-linux \
vim-enhanced \
wget \
xfsprogs \
fio \
stress-ng \
python36 \
" && \
yum -y install $INSTALL_PKGS && rpm -V --nosize --nofiledigest --nomtime --nomode $INSTALL_PKGS && yum clean all && rm -rf /var/cache/*
# Disabled until they are buildable on s390x
Expand All @@ -47,4 +54,5 @@ RUN INSTALL_PKGS="\
CMD ["/usr/bin/bash"]
LABEL io.k8s.display-name="OpenShift Tools" \
io.k8s.description="Contains debugging and diagnostic tools for use with an OpenShift cluster." \
io.openshift.build.versions="kubectl=1.29.1" \
io.openshift.tags="openshift,tools"