Upgrade centos in dockerfiles

Somehow an update to centos repos and the fact that docker.io centos
containers weren't updated for a while broke us. To fix this we need to
make sure RPMs in the container are upgraded, otherwise `yum history
undo last` fails miserably with missing packages errors.

Also this commit makes sure installation dies when we're unable to build
containers.

Change-Id: I29e19e13aa22047bfa07817a7794fc18612bbc32
This commit is contained in:
Michał Dulko 2020-04-24 13:38:39 +02:00
parent 3ad10bb484
commit 139b912365
3 changed files with 6 additions and 4 deletions

View File

@ -11,7 +11,8 @@ ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/mas
ARG OSLO_LOCK_PATH=/var/kuryr-lock
ARG PKG_YUM_REPO=https://rdoproject.org/repos/rdo-release.rpm
RUN yum install -y epel-release $PKG_YUM_REPO \
RUN yum upgrade -y \
&& yum install -y epel-release $PKG_YUM_REPO \
&& yum install -y --setopt=tsflags=nodocs python3-pip openvswitch sudo iproute libstdc++ pciutils kmod-libs \
&& yum install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git

View File

@ -3,7 +3,8 @@ LABEL authors="Antoni Segura Puimedon<toni@kuryr.org>, Michał Dulko<mdulko@redh
ARG UPPER_CONSTRAINTS_FILE="https://releases.openstack.org/constraints/upper/master"
RUN yum install -y epel-release \
RUN yum upgrade -y \
&& yum install -y epel-release \
&& yum install -y --setopt=tsflags=nodocs python3-pip libstdc++ \
&& yum install -y --setopt=tsflags=nodocs gcc gcc-c++ python3-devel git

View File

@ -17,9 +17,9 @@ set -o xtrace
function container_runtime {
if [[ ${CONTAINER_ENGINE} == 'crio' ]]; then
sudo podman "$@"
sudo podman "$@" || die $LINENO "Error when running podman command"
else
docker "$@"
docker "$@" || die $LINENO "Error when running docker command"
fi
}