diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2021-07-27 16:48:00 +0100 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2021-07-27 16:48:00 +0100 |
commit | d6767c2241925c22ac9fc4a347cd29db42d4ec52 (patch) | |
tree | 9d46871ddf292f84b86c637010ea16888b3d8a34 | |
parent | ad0e925588002a53d3a272198fddbb8bd91d4982 (diff) | |
download | libosinfo-d6767c2241925c22ac9fc4a347cd29db42d4ec52.tar.gz |
ci: refresh centos-stream container
It is no longer possible to just install an extra package to run regular
centos into centos stream.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r-- | ci/containers/ci-centos-stream.Dockerfile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ci/containers/ci-centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile index 6640d9a..ff936a4 100644 --- a/ci/containers/ci-centos-stream.Dockerfile +++ b/ci/containers/ci-centos-stream.Dockerfile @@ -1,14 +1,14 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-stream osinfo-db-tools,osinfo-db,libosinfo +# $ lcitool dockerfile centos-stream-8 osinfo-db-tools,osinfo-db,libosinfo # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/b098ec6631a85880f818f2dd25c437d509e53680 -FROM docker.io/library/centos:8 +# https://gitlab.com/libvirt/libvirt-ci/-/commit/6cd723b4affb2ee67e7d462dac480191c4b97598 + +FROM quay.io/centos/centos:stream8 RUN dnf update -y && \ - dnf install -y centos-release-stream && \ dnf install 'dnf-command(config-manager)' -y && \ - dnf config-manager --set-enabled -y Stream-PowerTools && \ + dnf config-manager --set-enabled -y powertools && \ dnf install -y centos-release-advanced-virtualization && \ dnf install -y epel-release && \ dnf install -y \ @@ -50,10 +50,10 @@ RUN dnf update -y && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/$(basename /usr/bin/gcc) + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc RUN pip3 install \ - meson==0.54.0 + meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" |