mirror of https://github.com/FRRouting/frr.git
docker: centos 7, 8 yang bump and repo fixes
Bump libyang version in centos containers to 1.0.184 and (1) change "PowerTools" repository to "powertools" to accomodate CentOS Stream changes (1) https://bugs.centos.org/view.php?id=17920 Signed-off-by: Wesley Coakley <wcoakley@nvidia.com>
This commit is contained in:
parent
56518fad27
commit
5fc9775130
|
@ -5,8 +5,8 @@ RUN yum install -y rpm-build autoconf automake libtool make \
|
|||
readline-devel texinfo net-snmp-devel groff pkgconfig \
|
||||
json-c-devel pam-devel bison flex pytest c-ares-devel \
|
||||
python3-devel python3-sphinx systemd-devel libcap-devel \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/CentOS-7-x86_64-Packages/libyang-0.16.111-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/CentOS-7-x86_64-Packages/libyang-devel-0.16.111-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-LY1REL/shared/build-4/CentOS-7-x86_64-Packages/libyang1-1.0.184-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-LY1REL/shared/build-4/CentOS-7-x86_64-Packages/libyang-devel-1.0.184-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/RPKI-RTRLIB/shared/build-110/CentOS-7-x86_64-Packages/librtr-0.7.0-1.el7.centos.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/RPKI-RTRLIB/shared/build-110/CentOS-7-x86_64-Packages/librtr-devel-0.7.0-1.el7.centos.x86_64.rpm
|
||||
|
||||
|
@ -32,7 +32,7 @@ RUN echo '%_smp_mflags %( echo "-j$(/usr/bin/getconf _NPROCESSORS_ONLN)"; )' >>
|
|||
# This stage installs frr from the rpm
|
||||
FROM centos:centos7
|
||||
RUN mkdir -p /pkgs/rpm \
|
||||
&& yum install -y https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/CentOS-7-x86_64-Packages/libyang-0.16.111-0.x86_64.rpm \
|
||||
&& yum install -y https://ci1.netdef.org/artifact/LIBYANG-LY1REL/shared/build-4/CentOS-7-x86_64-Packages/libyang1-1.0.184-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/RPKI-RTRLIB/shared/build-110/CentOS-7-x86_64-Packages/librtr-0.7.0-1.el7.centos.x86_64.rpm
|
||||
|
||||
COPY --from=centos-7-builder /rpmbuild/RPMS/ /pkgs/rpm/
|
||||
|
|
|
@ -1,17 +1,15 @@
|
|||
# This stage builds an rpm from the source
|
||||
FROM centos:centos8 as centos-8-builder
|
||||
|
||||
RUN dnf install --enablerepo=PowerTools -y rpm-build git autoconf pcre-devel \
|
||||
RUN dnf install --enablerepo=powertools -y rpm-build git autoconf pcre-devel \
|
||||
automake libtool make readline-devel texinfo net-snmp-devel pkgconfig \
|
||||
groff pkgconfig json-c-devel pam-devel bison flex python2-pytest \
|
||||
c-ares-devel python2-devel systemd-devel libcap-devel platform-python-devel \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/CentOS-7-x86_64-Packages/libyang-0.16.111-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/CentOS-7-x86_64-Packages/libyang-devel-0.16.111-0.x86_64.rpm \
|
||||
groff pkgconfig json-c-devel pam-devel bison flex python3-pytest \
|
||||
c-ares-devel python3-devel python3-sphinx systemd-devel libcap-devel platform-python-devel \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-LY1REL/shared/build-4/CentOS-8-x86_64-Packages/libyang1-1.0.184-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/LIBYANG-LY1REL/shared/build-4/CentOS-8-x86_64-Packages/libyang-devel-1.0.184-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/RPKI-RTRLIB/shared/build-110/CentOS-7-x86_64-Packages/librtr-0.7.0-1.el7.centos.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/RPKI-RTRLIB/shared/build-110/CentOS-7-x86_64-Packages/librtr-devel-0.7.0-1.el7.centos.x86_64.rpm
|
||||
|
||||
RUN pip2 install sphinx
|
||||
|
||||
COPY . /src
|
||||
|
||||
ARG PKGVER
|
||||
|
@ -35,7 +33,7 @@ RUN echo '%_smp_mflags %( echo "-j$(/usr/bin/getconf _NPROCESSORS_ONLN)"; )' >>
|
|||
# This stage installs frr from the rpm
|
||||
FROM centos:centos8
|
||||
RUN mkdir -p /pkgs/rpm \
|
||||
&& yum install -y https://ci1.netdef.org/artifact/LIBYANG-YANGRELEASE/shared/build-10/CentOS-7-x86_64-Packages/libyang-0.16.111-0.x86_64.rpm \
|
||||
&& yum install -y https://ci1.netdef.org/artifact/LIBYANG-LY1REL/shared/build-4/CentOS-8-x86_64-Packages/libyang1-1.0.184-0.x86_64.rpm \
|
||||
https://ci1.netdef.org/artifact/RPKI-RTRLIB/shared/build-110/CentOS-7-x86_64-Packages/librtr-0.7.0-1.el7.centos.x86_64.rpm
|
||||
|
||||
COPY --from=centos-8-builder /rpmbuild/RPMS/ /pkgs/rpm/
|
||||
|
|
Loading…
Reference in New Issue