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.

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

Switch to CentOS stream9 builder #2087

Merged
merged 1 commit into from
Mar 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions hack/build/bazel-build-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ if ! git diff-index --quiet HEAD~1 hack/build/docker; then

docker push ${UNTAGGED_BUILDER_IMAGE}:${BUILDER_TAG}
fi


24 changes: 9 additions & 15 deletions hack/build/docker/builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,14 @@
FROM registry.fedoraproject.org/fedora-minimal:33
FROM quay.io/centos/centos:stream9
MAINTAINER "The KubeVirt Project" <kubevirt-dev@googlegroups.com>

COPY fedora.repo /tmp/fedora_ci.dnf.repo

RUN sed -i 's/proxy = None//gI' /tmp/fedora_ci.dnf.repo && \
cat /tmp/fedora_ci.dnf.repo && \
mkdir /etc/yum.repos.d/old && \
mv /etc/yum.repos.d/*.repo /etc/yum.repos.d/old && \
mv /tmp/fedora_ci.dnf.repo /etc/yum.repos.d/fedora.repo && \
microdnf update -y && microdnf install -y \
RUN dnf -y install dnf-plugins-core && \
dnf config-manager --set-enable crb && dnf update -y && \
dnf install -y \
cpio \
diffutils \
git \
python3-pip \
python3-devel \
mercurial \
gcc \
gcc-c++ \
glibc-devel \
Expand All @@ -30,11 +24,7 @@ RUN sed -i 's/proxy = None//gI' /tmp/fedora_ci.dnf.repo && \
nbdkit-devel \
unzip \
java-11-openjdk-devel \
btrfs-progs-devel \
device-mapper-devel \
&& microdnf clean all && \
mv /etc/yum.repos.d/old/* /etc/yum.repos.d/ && \
rmdir /etc/yum.repos.d/old
&& dnf clean all

RUN pip3 install --upgrade j2cli operator-courier==2.1.11 && \
curl -sL https://services.gradle.org/distributions/gradle-6.6-bin.zip -o gradle-6.6-bin.zip && \
Expand Down Expand Up @@ -64,6 +54,10 @@ ENV BAZEL_VERSION 3.7.2

RUN curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-x86_64 && chmod u+x /usr/bin/bazel

# Until we use a version including the fix for this Bazel issue:
# https://github.com/bazelbuild/bazel/issues/11554
RUN ln -s /usr/bin/python3 /usr/bin/python

ADD entrypoint.sh /entrypoint.sh
ADD entrypoint-bazel.sh /entrypoint-bazel.sh

Expand Down
40 changes: 0 additions & 40 deletions hack/build/docker/builder/fedora.repo

This file was deleted.