From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Wed, 11 Aug 2021 23:44:24 +0000 (+0100)
Subject: docker: update package repositories
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64a2e6d22300e53332170d7e69e2a2086228f0cf;p=thirdparty%2Ffreeradius-server.git

docker: update package repositories
---

diff --git a/scripts/docker/build-centos7/Dockerfile.deps b/scripts/docker/build-centos7/Dockerfile.deps
index d49319abdde..75b91acada3 100644
--- a/scripts/docker/build-centos7/Dockerfile.deps
+++ b/scripts/docker/build-centos7/Dockerfile.deps
@@ -83,22 +83,15 @@ WORKDIR /usr/local/src/repositories
 
 
 #
-#  Set up NetworkRADIUS repositories for libkqueue and json-c
+#  Set up NetworkRADIUS extras repository
 #
-RUN echo $'[nr-libkqueue]\n\
-name=NetworkRADIUS-libkqueue-$releasever\n\
-baseurl=http://packages.networkradius.com/libkqueue/centos/$releasever/\n\
-enabled=1\n\
-gpgcheck=1\n\
-gpgkey=https://packages.networkradius.com/pgp/packages@networkradius.com\n\
-\n\
-[nr-json-c]\n\
-name=NetworkRADIUS-json-c-$releasever\n\
-baseurl=http://packages.networkradius.com/json-c/centos/$releasever/\n\
+RUN echo $'[networkradius-extras]\n\
+name=NetworkRADIUS-extras-$releasever\n\
+baseurl=http://packages.networkradius.com/extras/centos/$releasever/\n\
 enabled=1\n\
 gpgcheck=1\n\
 gpgkey=https://packages.networkradius.com/pgp/packages@networkradius.com'\
-> /etc/yum.repos.d/networkradius.repo
+> /etc/yum.repos.d/networkradius-extras.repo
 RUN rpm --import https://packages.networkradius.com/pgp/packages@networkradius.com
 
 
diff --git a/scripts/docker/build-debian10/Dockerfile.deps b/scripts/docker/build-debian10/Dockerfile.deps
index e4635869fbd..7b46c5be030 100644
--- a/scripts/docker/build-debian10/Dockerfile.deps
+++ b/scripts/docker/build-debian10/Dockerfile.deps
@@ -69,11 +69,10 @@ WORKDIR /usr/local/src/repositories
 
 
 #
-#  Set up NetworkRADIUS repositories for libkqueue and json-c
+#  Set up NetworkRADIUS extras repository
 #
 RUN wget -O - "https://packages.networkradius.com/pgp/packages%40networkradius.com" | apt-key add && \
-    echo "deb http://packages.networkradius.com/libkqueue/debian/buster buster main" > /etc/apt/sources.list.d/networkradius.list && \
-    echo "deb http://packages.networkradius.com/json-c/debian/buster buster main" >> /etc/apt/sources.list.d/networkradius.list && \
+    echo "deb http://packages.networkradius.com/extras/debian/buster buster main" >> /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update
 
 
diff --git a/scripts/docker/build-debian9/Dockerfile.deps b/scripts/docker/build-debian9/Dockerfile.deps
index 6dd2281984f..0f8019eca6c 100644
--- a/scripts/docker/build-debian9/Dockerfile.deps
+++ b/scripts/docker/build-debian9/Dockerfile.deps
@@ -68,11 +68,10 @@ WORKDIR /usr/local/src/repositories
 
 
 #
-#  Set up NetworkRADIUS repositories for libkqueue and json-c
+#  Set up NetworkRADIUS extras repository
 #
 RUN wget -O - "https://packages.networkradius.com/pgp/packages%40networkradius.com" | apt-key add && \
-    echo "deb http://packages.networkradius.com/libkqueue/debian/stretch stretch main" > /etc/apt/sources.list.d/networkradius.list && \
-    echo "deb http://packages.networkradius.com/json-c/debian/stretch stretch main" >> /etc/apt/sources.list.d/networkradius.list && \
+    echo "deb http://packages.networkradius.com/extras/debian/stretch stretch main" >> /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update
 
 
diff --git a/scripts/docker/build-ubuntu18/Dockerfile.deps b/scripts/docker/build-ubuntu18/Dockerfile.deps
index 688c1f92956..ba05549a581 100644
--- a/scripts/docker/build-ubuntu18/Dockerfile.deps
+++ b/scripts/docker/build-ubuntu18/Dockerfile.deps
@@ -69,11 +69,10 @@ WORKDIR /usr/local/src/repositories
 
 
 #
-#  Set up NetworkRADIUS repositories for libkqueue and json-c
+#  Set up NetworkRADIUS extras repository
 #
 RUN wget -O - "https://packages.networkradius.com/pgp/packages%40networkradius.com" | apt-key add && \
-    echo "deb http://packages.networkradius.com/libkqueue/ubuntu/bionic bionic main" > /etc/apt/sources.list.d/networkradius.list && \
-    echo "deb http://packages.networkradius.com/json-c/ubuntu/bionic bionic main" >> /etc/apt/sources.list.d/networkradius.list && \
+    echo "deb http://packages.networkradius.com/extras/ubuntu/bionic bionic main" > /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update
 
 
diff --git a/scripts/docker/build-ubuntu20/Dockerfile.deps b/scripts/docker/build-ubuntu20/Dockerfile.deps
index cc34830d9ba..54f29516ed3 100644
--- a/scripts/docker/build-ubuntu20/Dockerfile.deps
+++ b/scripts/docker/build-ubuntu20/Dockerfile.deps
@@ -69,10 +69,10 @@ WORKDIR /usr/local/src/repositories
 
 
 #
-#  Set up NetworkRADIUS repositories for libkqueue
+#  Set up NetworkRADIUS extras repository
 #
 RUN wget -O - "https://packages.networkradius.com/pgp/packages%40networkradius.com" | apt-key add && \
-    echo "deb http://packages.networkradius.com/libkqueue/ubuntu/bionic bionic main" > /etc/apt/sources.list.d/networkradius.list && \
+    echo "deb http://packages.networkradius.com/extras/ubuntu/focal focal main" > /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update