openstack/kuryr-kubernetes
Code Issues Proposed changes

Switch to Centos Stream 9 for container images.

Browse Source 
Change-Id: Ic3e96f0572baa0704688011deb60f705c2583d50
This commit is contained in:
Roman Dobosz 2022-05-25 13:32:38 +02:00
parent 38c0ac62ba
commit f63cea5470
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cni.Dockerfile
View File

@ -5,20 +5,14 @@ COPY . .
RUN GO111MODULE=auto go build -o /go/bin/kuryr-cni ./kuryr_cni/pkg/* RUN GO111MODULE=auto go build -o /go/bin/kuryr-cni ./kuryr_cni/pkg/*
FROM quay.io/centos/centos:stream8 FROM quay.io/centos/centos:stream9
LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redhat.com>" LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redhat.com>"
ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master" ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master"
ARG OSLO_LOCK_PATH=/var/kuryr-lock ARG OSLO_LOCK_PATH=/var/kuryr-lock
ARG RDO_REPO=https://repos.fedorapeople.org/repos/openstack/openstack-xena/rdo-release-xena-1.el8.noarch.rpm ARG RDO_REPO=https://repos.fedorapeople.org/repos/openstack/openstack-yoga/rdo-release-yoga-1.el9s.noarch.rpm
# NOTE(gryf): There is a sed substitution to make package manager to
# cooperate. It might be a subject to change in the future, either when
# yum/dnf starts to respect yum.conf variables, or mirror location would
# change.
RUN dnf upgrade -y && dnf install -y epel-release $RDO_REPO \ RUN dnf upgrade -y && dnf install -y epel-release $RDO_REPO \
&& sed -e 's/$releasever/8-stream/' -i /etc/yum.repos.d/messaging.repo \
&& sed -e 's/$basearch/x86_64/' -i /etc/yum.repos.d/messaging.repo \
&& dnf install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \ && dnf install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \
&& dnf install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git && dnf install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git

6
controller.Dockerfile
View File

@ -1,4 +1,4 @@
FROM quay.io/centos/centos:stream8 FROM quay.io/centos/centos:stream9
LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redhat.com>" LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redhat.com>"
ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master" ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master"
@ -15,8 +15,8 @@ RUN pip3 --no-cache-dir install -U pip \
&& dnf -y history undo last \ && dnf -y history undo last \
&& dnf clean all \ && dnf clean all \
&& rm -rf /opt/kuryr-kubernetes \ && rm -rf /opt/kuryr-kubernetes \
&& groupadd -r kuryr -g 711 \ && groupadd -r kuryr -g 1000 \
&& useradd -u 711 -g kuryr \ && useradd -u 1000 -g kuryr \
-d /opt/kuryr-kubernetes \ -d /opt/kuryr-kubernetes \
-s /sbin/nologin \ -s /sbin/nologin \
-c "Kuryr controller user" \ -c "Kuryr controller user" \