From ce9e2565f6e8febf50288f4e44487af69f1b08af Mon Sep 17 00:00:00 2001
From: Markus Frosch <markus.frosch@icinga.com>
Date: Fri, 30 Nov 2018 14:52:05 +0100
Subject: [PATCH] Switch devel:languages:go to home:lazyfrosch
Cleanup URL handling as well
---
15.0/Dockerfile | 5 +++--
42.3/Dockerfile | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/15.0/Dockerfile b/15.0/Dockerfile
index 8a7fb00..00b0caf 100644
--- a/15.0/Dockerfile
+++ b/15.0/Dockerfile
@@ -21,8 +21,9 @@ RUN groupadd -g 1000 jenkins \
&& echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
&& echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-RUN zypper --non-interactive addrepo https://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_15.0/devel:languages:go.repo \
- && zypper --non-interactive addrepo http://download.opensuse.org/repositories/home:lazyfrosch:devel:tools/openSUSE_Leap_15.0/home:lazyfrosch:devel:tools.repo \
+RUN OBS_DIST=openSUSE_Leap_15.0 \
+ && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
+ && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
&& zypper --gpg-auto-import-keys --non-interactive install spectool createrepo
RUN rpm --import https://packages.icinga.com/icinga.key \
diff --git a/42.3/Dockerfile b/42.3/Dockerfile
index 918163c..312935b 100644
--- a/42.3/Dockerfile
+++ b/42.3/Dockerfile
@@ -21,8 +21,9 @@ RUN groupadd -g 1000 jenkins \
&& echo 'Defaults:jenkins !requiretty' | tee -a /etc/sudoers \
&& echo 'jenkins ALL=(ALL:ALL) NOPASSWD: ALL' | tee -a /etc/sudoers
-RUN zypper --non-interactive addrepo https://download.opensuse.org/repositories/devel:/languages:/go/openSUSE_Leap_42.3/devel:languages:go.repo \
- && zypper --non-interactive addrepo http://download.opensuse.org/repositories/home:lazyfrosch:devel:tools/openSUSE_Leap_42.3/home:lazyfrosch:devel:tools.repo \
+RUN OBS_DIST=openSUSE_Leap_42.3 \
+ && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/languages:/go/"${OBS_DIST}"/home:lazyfrosch:devel:languages:go.repo \
+ && zypper --non-interactive addrepo https://download.opensuse.org/repositories/home:/lazyfrosch:/devel:/tools/"${OBS_DIST}"/home:lazyfrosch:devel:tools.repo \
&& zypper --gpg-auto-import-keys --non-interactive install spectool createrepo
RUN rpm --import https://packages.icinga.com/icinga.key \
--
GitLab