Skip to content

Commit

Permalink
Merge pull request #1421 from arooshap/docker-images-1
Browse files Browse the repository at this point in the history
Updating yum repos.
  • Loading branch information
arooshap authored Oct 3, 2023
2 parents 5ca68d2 + bda766a commit 1cb30db
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 21 deletions.
4 changes: 2 additions & 2 deletions docker/cmsweb-base-db/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cern/cc7-base:20221101-1 as builder
FROM cern/cc7-base:20230901-2 as builder
MAINTAINER Valentin Kuznetsov [email protected]

ENV WDIR=/data
Expand All @@ -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: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
Expand Down
4 changes: 2 additions & 2 deletions docker/cmsweb-base-db/cernonly2.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/cmsweb-base-db/epel.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/cmsweb-base-db/slc7-cernonly.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion docker/cmsweb-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions docker/cmsweb-base/slc7-cernonly.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/cmsweb/epel.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/cmsweb/slc7-cernonly.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/frontend/slc7-cernonly.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/frontendx509/slc7-cernonly.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/reqmgr2ms-unmerged/slc7-cernonly.repo
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 1cb30db

Please sign in to comment.