From 78cad912b1b531be0b736ceece190b82608b5579 Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Mon, 7 Mar 2022 09:27:33 +0100
Subject: [PATCH 1/2] Move kojicli to cs8
---
kojicli/Dockerfile | 4 ++--
.../{linuxsupport8-stable.repo => linuxsupport8s-stable.repo} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
rename kojicli/{linuxsupport8-stable.repo => linuxsupport8s-stable.repo} (60%)
diff --git a/kojicli/Dockerfile b/kojicli/Dockerfile
index 25dbc96..aa1959b 100644
--- a/kojicli/Dockerfile
+++ b/kojicli/Dockerfile
@@ -1,6 +1,6 @@
-FROM gitlab-registry.cern.ch/linuxsupport/c8-base:latest
+FROM gitlab-registry.cern.ch/linuxsupport/cs8-base:latest
-COPY linuxsupport8-stable.repo /etc/yum.repos.d/
+COPY linuxsupport8s-stable.repo /etc/yum.repos.d/
RUN dnf install -y epel-release \
&& dnf install -y koji python3-koji-cli-plugins krb5-workstation rpm-build \
diff --git a/kojicli/linuxsupport8-stable.repo b/kojicli/linuxsupport8s-stable.repo
similarity index 60%
rename from kojicli/linuxsupport8-stable.repo
rename to kojicli/linuxsupport8s-stable.repo
index 1a12615..fa99a0c 100644
--- a/kojicli/linuxsupport8-stable.repo
+++ b/kojicli/linuxsupport8s-stable.repo
@@ -1,6 +1,6 @@
-[linuxsupport8-stable]
+[linuxsupport8s-stable]
name=linuxsupport [stable]
-baseurl=http://linuxsoft.cern.ch/internal/repos/linuxsupport8-stable/$basearch/os
+baseurl=http://linuxsoft.cern.ch/internal/repos/linuxsupport8s-stable/$basearch/os
enabled=1
gpgcheck=False
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-koji file:///etc/pki/rpm-gpg/RPM-GPG-KEY-kojiv2
--
GitLab
From 40a0e0b0b589b7dce6d8592ee3d56f81aae3235b Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Mon, 7 Mar 2022 09:30:49 +0100
Subject: [PATCH 2/2] Install epel-next-release
---
kojicli/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kojicli/Dockerfile b/kojicli/Dockerfile
index aa1959b..cb08b8f 100644
--- a/kojicli/Dockerfile
+++ b/kojicli/Dockerfile
@@ -2,7 +2,7 @@ FROM gitlab-registry.cern.ch/linuxsupport/cs8-base:latest
COPY linuxsupport8s-stable.repo /etc/yum.repos.d/
-RUN dnf install -y epel-release \
+RUN dnf install -y epel-next-release \
&& dnf install -y koji python3-koji-cli-plugins krb5-workstation rpm-build \
&& dnf clean all
--
GitLab