From ceadf87fdc74497b1feccc4fac774c4a99f55d67 Mon Sep 17 00:00:00 2001 From: Aroosha Pervaiz Date: Tue, 3 Oct 2023 12:17:32 +0200 Subject: [PATCH 1/2] U[pdating yum repos. --- docker/cmsweb-base-db/Dockerfile | 4 ++-- docker/cmsweb-base-db/cernonly2.repo | 4 ++-- docker/cmsweb-base-db/epel.repo | 4 ++-- docker/cmsweb-base-db/slc7-cernonly.repo | 4 ++-- docker/cmsweb-base/Dockerfile | 1 - docker/cmsweb-base/slc7-cernonly.repo | 4 ++-- docker/cmsweb/epel.repo | 4 ++-- docker/cmsweb/slc7-cernonly.repo | 4 ++-- docker/frontend/slc7-cernonly.repo | 4 ++-- docker/frontendx509/slc7-cernonly.repo | 4 ++-- docker/reqmgr2ms-unmerged/slc7-cernonly.repo | 4 ++-- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/docker/cmsweb-base-db/Dockerfile b/docker/cmsweb-base-db/Dockerfile index e23dac413..c99cb7d57 100644 --- a/docker/cmsweb-base-db/Dockerfile +++ b/docker/cmsweb-base-db/Dockerfile @@ -1,4 +1,4 @@ -FROM cern/cc7-base:20221101-1 as builder +FROM cern/cc7-base:20230928-1 as builder MAINTAINER Valentin Kuznetsov vkuznet@gmail.com ENV WDIR=/data @@ -10,7 +10,7 @@ RUN yum install -y git-core make gcc golang sudo oracle-instantclient-tnsnames.o oracle-instantclient-devel oracle-instantclient-basic \ && yum clean all && rm -rf /var/cache/yum -FROM cern/cc7-base:20221101-1 +FROM cern/cc7-base:20230928-1 RUN yum install -y libaio && yum clean all && rm -rf /var/cache/yum RUN mkdir -p /data COPY --from=builder /usr/lib/oracle /usr/lib/oracle diff --git a/docker/cmsweb-base-db/cernonly2.repo b/docker/cmsweb-base-db/cernonly2.repo index 7cee04a17..7141e1de0 100644 --- a/docker/cmsweb-base-db/cernonly2.repo +++ b/docker/cmsweb-base-db/cernonly2.repo @@ -1,6 +1,6 @@ [cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/docker/cmsweb-base-db/epel.repo b/docker/cmsweb-base-db/epel.repo index ab9bfb68b..a42146c45 100644 --- a/docker/cmsweb-base-db/epel.repo +++ b/docker/cmsweb-base-db/epel.repo @@ -1,6 +1,6 @@ [epel] -name=Extra Packages for Enterprise Linux [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/epel/7/x86_64 +name=Extra Packages for Enterprise Linux [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/epel/7/x86_64 enabled=1 gpgcheck=1 gpgkey=http://linuxsoft.cern.ch/epel/RPM-GPG-KEY-EPEL-7 diff --git a/docker/cmsweb-base-db/slc7-cernonly.repo b/docker/cmsweb-base-db/slc7-cernonly.repo index 26b17c4f7..19d181957 100644 --- a/docker/cmsweb-base-db/slc7-cernonly.repo +++ b/docker/cmsweb-base-db/slc7-cernonly.repo @@ -1,6 +1,6 @@ [slc7-cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/docker/cmsweb-base/Dockerfile b/docker/cmsweb-base/Dockerfile index 31750f29a..6fe8388b6 100644 --- a/docker/cmsweb-base/Dockerfile +++ b/docker/cmsweb-base/Dockerfile @@ -10,5 +10,4 @@ RUN yum install -y sudo cern-get-certificate fetch-crl \ ca_EG-GRID ca_CERN-GridCA ca_CERN-LCG-IOTA-CA ca_CERN-Root-2 \ && yum install -y --nogpgcheck wlcg-voms-cms && yum clean all && rm -rf /var/cache/yum && ln -s /bin/bash /usr/bin/bashs && echo "32 */6 * * * root ! /usr/sbin/fetch-crl -q -r 360" > /etc/cron.d/fetch-crl-docker -RUN yum info CERN-CA-certs RUN update-ca-trust diff --git a/docker/cmsweb-base/slc7-cernonly.repo b/docker/cmsweb-base/slc7-cernonly.repo index 26b17c4f7..19d181957 100644 --- a/docker/cmsweb-base/slc7-cernonly.repo +++ b/docker/cmsweb-base/slc7-cernonly.repo @@ -1,6 +1,6 @@ [slc7-cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/docker/cmsweb/epel.repo b/docker/cmsweb/epel.repo index ab9bfb68b..a42146c45 100644 --- a/docker/cmsweb/epel.repo +++ b/docker/cmsweb/epel.repo @@ -1,6 +1,6 @@ [epel] -name=Extra Packages for Enterprise Linux [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/epel/7/x86_64 +name=Extra Packages for Enterprise Linux [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/epel/7/x86_64 enabled=1 gpgcheck=1 gpgkey=http://linuxsoft.cern.ch/epel/RPM-GPG-KEY-EPEL-7 diff --git a/docker/cmsweb/slc7-cernonly.repo b/docker/cmsweb/slc7-cernonly.repo index 26b17c4f7..19d181957 100644 --- a/docker/cmsweb/slc7-cernonly.repo +++ b/docker/cmsweb/slc7-cernonly.repo @@ -1,6 +1,6 @@ [slc7-cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/docker/frontend/slc7-cernonly.repo b/docker/frontend/slc7-cernonly.repo index 26b17c4f7..19d181957 100644 --- a/docker/frontend/slc7-cernonly.repo +++ b/docker/frontend/slc7-cernonly.repo @@ -1,6 +1,6 @@ [slc7-cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/docker/frontendx509/slc7-cernonly.repo b/docker/frontendx509/slc7-cernonly.repo index 26b17c4f7..19d181957 100644 --- a/docker/frontendx509/slc7-cernonly.repo +++ b/docker/frontendx509/slc7-cernonly.repo @@ -1,6 +1,6 @@ [slc7-cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern diff --git a/docker/reqmgr2ms-unmerged/slc7-cernonly.repo b/docker/reqmgr2ms-unmerged/slc7-cernonly.repo index 26b17c4f7..19d181957 100644 --- a/docker/reqmgr2ms-unmerged/slc7-cernonly.repo +++ b/docker/reqmgr2ms-unmerged/slc7-cernonly.repo @@ -1,6 +1,6 @@ [slc7-cernonly] -name=CentOS-7 - CERN Only [20221101] -baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20221101/cern/centos/7/cernonly/x86_64 +name=CentOS-7 - CERN Only [20230928] +baseurl=http://linuxsoft.cern.ch/internal/yumsnapshot/20230928/cern/centos/7/cernonly/x86_64 enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-cern From bda766acc439b66fba0e4c9513fff11c759489d1 Mon Sep 17 00:00:00 2001 From: Aroosha Pervaiz Date: Tue, 3 Oct 2023 12:22:02 +0200 Subject: [PATCH 2/2] Updating cc7 image. --- docker/cmsweb-base-db/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/cmsweb-base-db/Dockerfile b/docker/cmsweb-base-db/Dockerfile index c99cb7d57..dcf481879 100644 --- a/docker/cmsweb-base-db/Dockerfile +++ b/docker/cmsweb-base-db/Dockerfile @@ -1,4 +1,4 @@ -FROM cern/cc7-base:20230928-1 as builder +FROM cern/cc7-base:20230901-2 as builder MAINTAINER Valentin Kuznetsov vkuznet@gmail.com ENV WDIR=/data @@ -10,7 +10,7 @@ RUN yum install -y git-core make gcc golang sudo oracle-instantclient-tnsnames.o oracle-instantclient-devel oracle-instantclient-basic \ && yum clean all && rm -rf /var/cache/yum -FROM cern/cc7-base:20230928-1 +FROM cern/cc7-base:20230901-2 RUN yum install -y libaio && yum clean all && rm -rf /var/cache/yum RUN mkdir -p /data COPY --from=builder /usr/lib/oracle /usr/lib/oracle