diff --git a/docker/CentOS-Base.repo b/docker/testsuite/CentOS-Base.repo similarity index 100% rename from docker/CentOS-Base.repo rename to docker/testsuite/CentOS-Base.repo diff --git a/docker/testsuite/Dockerfile.centos7 b/docker/testsuite/Dockerfile.centos7 index 43b8e28..1384c08 100644 --- a/docker/testsuite/Dockerfile.centos7 +++ b/docker/testsuite/Dockerfile.centos7 @@ -9,7 +9,7 @@ ARG VOMS_REPO=stable ENV VOMS_REPO_URL=https://italiangrid.github.io/voms-repo/repofiles/rhel/voms-${VOMS_REPO}-el${RHEL_VERSION}.repo -COPY ../CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo +COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo COPY assets/scripts/*.sh /tmp/scripts/ RUN yum install -y epel-release \ diff --git a/docker/voms/CentOS-Base.repo b/docker/voms/CentOS-Base.repo new file mode 100644 index 0000000..5b79365 --- /dev/null +++ b/docker/voms/CentOS-Base.repo @@ -0,0 +1,24 @@ +[base] +name=CentOS-$releasever - Base +baseurl=http://vault.centos.org/7.9.2009/os/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 + +[updates] +name=CentOS-$releasever - Updates +baseurl=http://vault.centos.org/7.9.2009/updates/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 + +[extras] +name=CentOS-$releasever - Extras +baseurl=http://vault.centos.org/7.9.2009/extras/$basearch/ +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 + +[centosplus] +name=CentOS-$releasever - Plus +baseurl=http://vault.centos.org/7.9.2009/centosplus/$basearch/ +gpgcheck=1 +enabled=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 diff --git a/docker/voms/Dockerfile.centos7 b/docker/voms/Dockerfile.centos7 index e2e5fd5..a3619a6 100644 --- a/docker/voms/Dockerfile.centos7 +++ b/docker/voms/Dockerfile.centos7 @@ -11,7 +11,7 @@ ARG UMD_RELEASE_PACKAGE_URL=http://repository.egi.eu/sw/production/umd/4/centos7 ENV VOMS_REPO_URL=https://italiangrid.github.io/voms-repo/repofiles/rhel/voms-${VOMS_REPO}-el${RHEL_VERSION}.repo -COPY ../CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo +COPY CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo COPY assets/scripts/*.sh /tmp/scripts/ RUN yum -y install hostname which wget tar sudo file less epel-release ${UMD_RELEASE_PACKAGE_URL} yum-utils