update jenkins dockerfiles

FreeRADIUS · Jul 31, 2019 · 89f6580 · 89f6580
1 parent 1212e63
commit 89f6580
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 17 deletions.
diff --git a/scripts/docker/build-debian10/Dockerfile.jenkins b/scripts/docker/build-debian10/Dockerfile.jenkins
@@ -8,9 +8,10 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 #  This is necessary for the jenkins server to talk to the docker instance
 #
-# RUN echo deb http://ftp.debian.org/debian ${osname}-backports main >> /etc/apt/sources.list
 RUN apt-get update && \
-    apt-get install -y openjdk-11-jre-headless openssh-server sudo
+    apt-get install -y openjdk-11-jre-headless \
+                       openssh-server \
+                       sudo
 
 RUN useradd -m jenkins
 RUN echo "jenkins:jenkins1" | chpasswd

diff --git a/scripts/docker/build-debian8/Dockerfile.jenkins b/scripts/docker/build-debian8/Dockerfile.jenkins
@@ -8,9 +8,12 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 #  This is necessary for the jenkins server to talk to the docker instance
 #
-RUN echo deb http://ftp.debian.org/debian ${osname}-backports main >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t ${osname}-backports install -y openjdk-8-jre-headless
-RUN apt-get install -y openssh-server sudo
+RUN echo "deb [check-valid-until=no] http://archive.debian.org/debian ${osname}-backports main" >> /etc/apt/sources.list
+RUN echo 'Acquire::Check-Valid-Until "false";' >> /etc/apt/apt.conf
+RUN apt-get update && \
+    apt-get -t ${osname}-backports install -y openjdk-8-jre-headless
+RUN apt-get install -y openssh-server \
+                       sudo
 
 RUN useradd -m jenkins
 RUN echo "jenkins:jenkins1" | chpasswd

diff --git a/scripts/docker/build-debian9/Dockerfile.jenkins b/scripts/docker/build-debian9/Dockerfile.jenkins
@@ -8,9 +8,10 @@ ARG DEBIAN_FRONTEND=noninteractive
 #
 #  This is necessary for the jenkins server to talk to the docker instance
 #
-RUN echo deb http://ftp.debian.org/debian ${osname}-backports main >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t ${osname}-backports install -y openjdk-8-jre-headless
-RUN apt-get install -y openssh-server sudo
+RUN apt-get update && \
+    apt-get install -y openjdk-8-jre-headless \
+                       openssh-server \
+                       sudo
 
 RUN useradd -m jenkins
 RUN echo "jenkins:jenkins1" | chpasswd

diff --git a/scripts/docker/build-ubuntu14/Dockerfile.jenkins b/scripts/docker/build-ubuntu14/Dockerfile.jenkins
@@ -8,10 +8,13 @@ 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
-
-RUN apt-get install -y openssh-server sudo
+RUN apt-get update && \
+    apt-get install -y openjdk-8-jre-headless \
+                       openssh-server \
+                       sudo
 
 RUN useradd -m jenkins
 RUN echo "jenkins:jenkins1" | chpasswd

diff --git a/scripts/docker/build-ubuntu16/Dockerfile.jenkins b/scripts/docker/build-ubuntu16/Dockerfile.jenkins
@@ -8,10 +8,13 @@ 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
-
-RUN apt-get install -y openssh-server sudo
+RUN apt-get update && \
+    apt-get install -y openjdk-8-jre-headless \
+                       openssh-server \
+                       sudo
 
 RUN useradd -m jenkins
 RUN echo "jenkins:jenkins1" | chpasswd

diff --git a/scripts/docker/build-ubuntu18/Dockerfile.jenkins b/scripts/docker/build-ubuntu18/Dockerfile.jenkins
@@ -8,10 +8,13 @@ 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
-
-RUN apt-get install -y openssh-server sudo
+RUN apt-get update && \
+    apt-get install -y openjdk-8-jre-headless \
+                       openssh-server \
+                       sudo
 
 RUN useradd -m jenkins
 RUN echo "jenkins:jenkins1" | chpasswd