Update docker image to centos 8.2.2004
Due to changes in dnf and RPM tools a newer version of dnf is needed. Also update the EPEL release so a newer version of mock is picked up (> 2.6). Otherwise the builds will not build properly. Test: 1. Apply patch to Dockerfile. 2. Build docker image. 3. Build package with out warnings. Signed-off-by: Charles Short <charles.short@windriver.com> Change-Id: I538b6523068695d3ef857c9ad599fda45445edd0
This commit is contained in:
parent
a86daf0f55
commit
55acd5bc8c
10
Dockerfile
10
Dockerfile
|
@ -13,7 +13,7 @@
|
||||||
# Copyright (C) 2019 Intel Corporation
|
# Copyright (C) 2019 Intel Corporation
|
||||||
#
|
#
|
||||||
|
|
||||||
FROM centos:8.1.1911
|
FROM centos:8.2.2004
|
||||||
|
|
||||||
# Proxy configuration
|
# Proxy configuration
|
||||||
#ENV http_proxy "http://your.actual_http_proxy.com:your_port"
|
#ENV http_proxy "http://your.actual_http_proxy.com:your_port"
|
||||||
|
@ -32,8 +32,8 @@ ARG MYUNAME=builder
|
||||||
ARG MYUID=1000
|
ARG MYUID=1000
|
||||||
# CentOS & EPEL URLs that match the base image
|
# CentOS & EPEL URLs that match the base image
|
||||||
# Override these with --build-arg if you have a mirror
|
# Override these with --build-arg if you have a mirror
|
||||||
ARG CENTOS_8_1_URL=https://vault.centos.org/8.1.1911
|
ARG CENTOS_8_2_URL=https://vault.centos.org/8.2.2004
|
||||||
ARG EPEL_8_1_URL=https://archives.fedoraproject.org/pub/archive/epel/8.1.2020-04-22/Everything
|
ARG EPEL_8_2_URL=https://archives.fedoraproject.org/pub/archive/epel/8.2.2020-11-04/Everything
|
||||||
ARG MY_EMAIL=
|
ARG MY_EMAIL=
|
||||||
|
|
||||||
ENV container=docker
|
ENV container=docker
|
||||||
|
@ -46,8 +46,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY* && \
|
||||||
echo "http_caching=packages" >> /etc/dnf/dnf.conf && \
|
echo "http_caching=packages" >> /etc/dnf/dnf.conf && \
|
||||||
echo "skip_missing_names_on_install=0" >>/etc/dnf/dnf.conf && \
|
echo "skip_missing_names_on_install=0" >>/etc/dnf/dnf.conf && \
|
||||||
# dnf variables must be in lower case ; \
|
# dnf variables must be in lower case ; \
|
||||||
echo "$CENTOS_8_1_URL" > /etc/dnf/vars/centos_8_1_url && \
|
echo "$CENTOS_8_2_URL" > /etc/dnf/vars/centos_8_2_url && \
|
||||||
echo "$EPEL_8_1_URL" > /etc/dnf/vars/epel_8_1_url && \
|
echo "$EPEL_8_2_URL" > /etc/dnf/vars/epel_8_1_url && \
|
||||||
# disable fastestmirror plugin because we are not using mirrors ; \
|
# disable fastestmirror plugin because we are not using mirrors ; \
|
||||||
# FIXME: use a mirrorlist URL for centos/vault/epel archives. I couldn't find one.
|
# FIXME: use a mirrorlist URL for centos/vault/epel archives. I couldn't find one.
|
||||||
echo "fastestmirror=False" >> /etc/dnf/dnf.conf && \
|
echo "fastestmirror=False" >> /etc/dnf/dnf.conf && \
|
||||||
|
|
2
tb.sh
2
tb.sh
|
@ -22,7 +22,7 @@ fi
|
||||||
CMD=$1
|
CMD=$1
|
||||||
|
|
||||||
TC_CONTAINER_NAME=${MYUNAME}-centos-builder
|
TC_CONTAINER_NAME=${MYUNAME}-centos-builder
|
||||||
TC_CONTAINER_TAG=local/${MYUNAME}-stx-builder:8.1.1911
|
TC_CONTAINER_TAG=local/${MYUNAME}-stx-builder:8.2.2004
|
||||||
TC_DOCKERFILE=Dockerfile
|
TC_DOCKERFILE=Dockerfile
|
||||||
|
|
||||||
function create_container {
|
function create_container {
|
||||||
|
|
|
@ -1,29 +1,29 @@
|
||||||
# centos_8_1_url must be defined in /etc/dnf/vars/
|
# centos_8_2_url must be defined in /etc/dnf/vars/
|
||||||
|
|
||||||
[centos-appstream]
|
[centos-appstream]
|
||||||
name=centos-os
|
name=centos-os
|
||||||
baseurl=$centos_8_1_url/AppStream/$basearch/os/
|
baseurl=$centos_8_2_url/AppStream/$basearch/os/
|
||||||
enabled=1
|
enabled=1
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
||||||
|
|
||||||
[centos-extras]
|
[centos-extras]
|
||||||
name=centos-extras
|
name=centos-extras
|
||||||
baseurl=$centos_8_1_url/extras/$basearch/os/
|
baseurl=$centos_8_2_url/extras/$basearch/os/
|
||||||
enabled=1
|
enabled=1
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
||||||
|
|
||||||
[centos-powertools]
|
[centos-powertools]
|
||||||
name=centos-powertools
|
name=centos-powertools
|
||||||
baseurl=$centos_8_1_url/PowerTools/$basearch/os/
|
baseurl=$centos_8_2_url/PowerTools/$basearch/os/
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
||||||
enabled=1
|
enabled=1
|
||||||
|
|
||||||
[centos-baseos]
|
[centos-baseos]
|
||||||
name=centos-baseos
|
name=centos-baseos
|
||||||
baseurl=$centos_8_1_url/BaseOS/$basearch/os/
|
baseurl=$centos_8_2_url/BaseOS/$basearch/os/
|
||||||
gpgcheck=1
|
gpgcheck=1
|
||||||
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
|
||||||
enabled=1
|
enabled=1
|
||||||
|
|
Loading…
Reference in New Issue