From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Sat, 23 Apr 2022 10:26:11 +0000 (+0100)
Subject: docker: tidy unused jenkins dockerfiles
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=874c5b3818f64088514953d841956e6bbd976be8;p=thirdparty%2Ffreeradius-server.git

docker: tidy unused jenkins dockerfiles
---

diff --git a/scripts/docker/build-centos7/Dockerfile.jenkins b/scripts/docker/build-centos7/Dockerfile.jenkins
deleted file mode 100644
index f9b50645cd8..00000000000
--- a/scripts/docker/build-centos7/Dockerfile.jenkins
+++ /dev/null
@@ -1,22 +0,0 @@
-ARG from=freeradius/centos7-deps
-FROM ${from}
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN yum install -y java-1.8.0-openjdk-headless \
-                   createrepo \
-                   openssh-server \
-                   sudo && \
-    yum -y upgrade
-
-RUN adduser jenkins
-RUN printf jenkins1 | passwd --stdin jenkins
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]
diff --git a/scripts/docker/build-debian10/Dockerfile.jenkins b/scripts/docker/build-debian10/Dockerfile.jenkins
deleted file mode 100644
index aa1e04aa8ee..00000000000
--- a/scripts/docker/build-debian10/Dockerfile.jenkins
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM freeradius/debian10-deps
-
-SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
-
-ARG APT_OPTS="-y --option=Dpkg::options::=--force-unsafe-io --no-install-recommends"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN apt-get update && \
-    apt-get upgrade $APT_OPTS --option=Dpkg::Options::=--force-confdef --option=Dpkg::Options::=--force-confold && \
-    apt-get install $APT_OPTS \
-        default-jre-headless \
-        openssh-server \
-        sudo
-
-RUN useradd -m jenkins
-RUN echo "jenkins:jenkins1" | chpasswd
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-# RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]
diff --git a/scripts/docker/build-debian11/Dockerfile.jenkins b/scripts/docker/build-debian11/Dockerfile.jenkins
deleted file mode 100644
index eae9c31db66..00000000000
--- a/scripts/docker/build-debian11/Dockerfile.jenkins
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM freeradius/debian11-deps
-
-SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
-
-ARG APT_OPTS="-y --option=Dpkg::options::=--force-unsafe-io --no-install-recommends"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN apt-get update && \
-    apt-get upgrade $APT_OPTS --option=Dpkg::Options::=--force-confdef --option=Dpkg::Options::=--force-confold && \
-    apt-get install $APT_OPTS \
-        default-jre-headless \
-        openssh-server \
-        sudo
-
-RUN useradd -m jenkins
-RUN echo "jenkins:jenkins1" | chpasswd
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-# RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]
diff --git a/scripts/docker/build-debian9/Dockerfile.jenkins b/scripts/docker/build-debian9/Dockerfile.jenkins
deleted file mode 100644
index 7ed7a29f133..00000000000
--- a/scripts/docker/build-debian9/Dockerfile.jenkins
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM freeradius/debian9-deps
-
-SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
-
-ARG APT_OPTS="-y --option=Dpkg::options::=--force-unsafe-io --no-install-recommends"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN apt-get update && \
-    apt-get upgrade $APT_OPTS --option=Dpkg::Options::=--force-confdef --option=Dpkg::Options::=--force-confold && \
-    apt-get install $APT_OPTS \
-        default-jre-headless \
-        openssh-server \
-        sudo
-
-RUN useradd -m jenkins
-RUN echo "jenkins:jenkins1" | chpasswd
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-# RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]
diff --git a/scripts/docker/build-debiansid/Dockerfile.jenkins b/scripts/docker/build-debiansid/Dockerfile.jenkins
deleted file mode 100644
index b14b0eacda3..00000000000
--- a/scripts/docker/build-debiansid/Dockerfile.jenkins
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM freeradius/debiansid-deps
-
-SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
-
-ARG APT_OPTS="-y --option=Dpkg::options::=--force-unsafe-io --no-install-recommends"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN apt-get update && \
-    apt-get upgrade $APT_OPTS --option=Dpkg::Options::=--force-confdef --option=Dpkg::Options::=--force-confold && \
-    apt-get install $APT_OPTS \
-        default-jre-headless \
-        openssh-server \
-        sudo
-
-RUN useradd -m jenkins
-RUN echo "jenkins:jenkins1" | chpasswd
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-# RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]
diff --git a/scripts/docker/build-ubuntu18/Dockerfile.jenkins b/scripts/docker/build-ubuntu18/Dockerfile.jenkins
deleted file mode 100644
index 5022d3a96ed..00000000000
--- a/scripts/docker/build-ubuntu18/Dockerfile.jenkins
+++ /dev/null
@@ -1,29 +0,0 @@
-ARG from=freeradius/ubuntu18-deps
-FROM ${from}
-
-ARG osname=bionic
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN apt-get update && \
-    apt-get install -y software-properties-common
-RUN apt-add-repository ppa:openjdk-r/ppa
-RUN apt-get update && \
-    apt-get install -y openjdk-8-jre-headless \
-                       openssh-server \
-                       sudo && \
-    apt-get -y upgrade
-
-RUN useradd -m jenkins
-RUN echo "jenkins:jenkins1" | chpasswd
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-# RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]
diff --git a/scripts/docker/build-ubuntu20/Dockerfile.jenkins b/scripts/docker/build-ubuntu20/Dockerfile.jenkins
deleted file mode 100644
index f3deffb1cae..00000000000
--- a/scripts/docker/build-ubuntu20/Dockerfile.jenkins
+++ /dev/null
@@ -1,34 +0,0 @@
-ARG from=freeradius/ubuntu20-deps
-FROM ${from}
-
-SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
-
-ARG APT_OPTS="-y --option=Dpkg::options::=--force-unsafe-io --no-install-recommends"
-
-ARG DEBIAN_FRONTEND=noninteractive
-
-#
-#  This is necessary for the jenkins server to talk to the docker instance
-#
-RUN apt-get update && \
-    apt-get upgrade $APT_OPTS --option=Dpkg::Options::=--force-confdef --option=Dpkg::Options::=--force-confold && \
-    apt-get install $APT_OPTS \
-        software-properties-common
-RUN apt-add-repository ppa:openjdk-r/ppa
-RUN apt-get update && \
-    apt-get install $APT_OPTS \
-        openjdk-8-jre-headless \
-        openssh-server \
-        sudo && \
-    apt-get -y upgrade
-
-RUN useradd -m jenkins
-RUN echo "jenkins:jenkins1" | chpasswd
-RUN echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
-RUN mkdir /var/run/sshd
-
-# RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N ''
-RUN sed -i 's|session    required     pam_loginuid.so|session    optional     pam_loginuid.so|g' /etc/pam.d/sshd
-
-EXPOSE 22
-CMD ["/usr/sbin/sshd","-D"]