From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 20 Nov 2017 16:05:06 +0000 (+0000)
Subject: Rename the Dockerfile that builds the dependencies to Dockerfile.deps not Dockerfile... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb56b4fc532ef2cca65f33de271a5608adf05b9;p=thirdparty%2Ffreeradius-server.git

Rename the Dockerfile that builds the dependencies to Dockerfile.deps not Dockerfile.source
---

diff --git a/scripts/docker/build-centos6/Dockerfile b/scripts/docker/build-centos6/Dockerfile
index 10dc15b54c6..20a45dc5fbf 100644
--- a/scripts/docker/build-centos6/Dockerfile
+++ b/scripts/docker/build-centos6/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/centos6-source
+FROM freeradius/centos6-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN ./configure --prefix=/opt/freeradius
@@ -10,7 +10,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/centos6-source
+FROM freeradius/centos6-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-centos6/Dockerfile.source b/scripts/docker/build-centos6/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-centos6/Dockerfile.source
rename to scripts/docker/build-centos6/Dockerfile.deps
diff --git a/scripts/docker/build-centos6/Dockerfile.jenkins b/scripts/docker/build-centos6/Dockerfile.jenkins
index 32b9ce5464e..84430038030 100644
--- a/scripts/docker/build-centos6/Dockerfile.jenkins
+++ b/scripts/docker/build-centos6/Dockerfile.jenkins
@@ -1,4 +1,4 @@
-FROM freeradius/centos6-source
+FROM freeradius/centos6-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance
diff --git a/scripts/docker/build-centos7/Dockerfile b/scripts/docker/build-centos7/Dockerfile
index 958b3219804..aafb48655c1 100644
--- a/scripts/docker/build-centos7/Dockerfile
+++ b/scripts/docker/build-centos7/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/centos7-source
+FROM freeradius/centos7-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN ./configure --prefix=/opt/freeradius
@@ -10,7 +10,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/centos7-source
+FROM freeradius/centos7-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-centos7/Dockerfile.source b/scripts/docker/build-centos7/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-centos7/Dockerfile.source
rename to scripts/docker/build-centos7/Dockerfile.deps
diff --git a/scripts/docker/build-centos7/Dockerfile.jenkins b/scripts/docker/build-centos7/Dockerfile.jenkins
index 88c57e1582b..6e1dc0be124 100644
--- a/scripts/docker/build-centos7/Dockerfile.jenkins
+++ b/scripts/docker/build-centos7/Dockerfile.jenkins
@@ -1,4 +1,4 @@
-FROM freeradius/centos7-source
+FROM freeradius/centos7-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance
diff --git a/scripts/docker/build-debian7/Dockerfile b/scripts/docker/build-debian7/Dockerfile
index 3b76717431a..eef1ba9395e 100644
--- a/scripts/docker/build-debian7/Dockerfile
+++ b/scripts/docker/build-debian7/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/debian7-source
+FROM freeradius/debian7-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN git checkout v3.0.x
@@ -11,7 +11,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/debian7-source
+FROM freeradius/debian7-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-debian7/Dockerfile.source b/scripts/docker/build-debian7/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-debian7/Dockerfile.source
rename to scripts/docker/build-debian7/Dockerfile.deps
diff --git a/scripts/docker/build-debian7/Dockerfile.jenkins b/scripts/docker/build-debian7/Dockerfile.jenkins
index 42fc5e3783c..6ffb0be990c 100644
--- a/scripts/docker/build-debian7/Dockerfile.jenkins
+++ b/scripts/docker/build-debian7/Dockerfile.jenkins
@@ -1,4 +1,4 @@
-FROM freeradius/debian7-source
+FROM freeradius/debian7-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance
@@ -9,9 +9,9 @@ RUN hg clone http://hg.openjdk.java.net/jdk8/jdk8 YourOpenJDK ;\
     cd YourOpenJDK ;\
     bash ./get_source.sh
 RUN apt-get install -y cpio zip openjdk-7-jdk libX11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev cups libcups2-dev
-RUN apt-get install -y libfreetype6-dev libasound2-dev 
+RUN apt-get install -y libfreetype6-dev libasound2-dev
 
-RUN cd YourOpenJDK && bash ./configure && make 
+RUN cd YourOpenJDK && bash ./configure && make
 RUN cd YourOpenJDK && make install
 
 RUN apt-get install -y sudo && echo "jenkins ALL=(ALL:ALL) NOPASSWD:ALL" > /etc/sudoers
diff --git a/scripts/docker/build-debian8/Dockerfile b/scripts/docker/build-debian8/Dockerfile
index 312ef4c2ec3..de7a2490782 100644
--- a/scripts/docker/build-debian8/Dockerfile
+++ b/scripts/docker/build-debian8/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/debian8-source
+FROM freeradius/debian8-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN ./configure --prefix=/opt/freeradius
@@ -10,7 +10,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/debian8-source
+FROM freeradius/debian8-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-debian8/Dockerfile.source b/scripts/docker/build-debian8/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-debian8/Dockerfile.source
rename to scripts/docker/build-debian8/Dockerfile.deps
diff --git a/scripts/docker/build-debian8/Dockerfile.jenkins b/scripts/docker/build-debian8/Dockerfile.jenkins
index 9fc09696200..007b8317901 100644
--- a/scripts/docker/build-debian8/Dockerfile.jenkins
+++ b/scripts/docker/build-debian8/Dockerfile.jenkins
@@ -1,11 +1,11 @@
-FROM freeradius/debian8-source
+FROM freeradius/debian8-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance
 #
 RUN echo deb http://ftp.debian.org/debian jessie-backports main >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t jessie-backports install -y openjdk-8-jre-headless 
-RUN apt-get install -y openssh-server sudo 
+RUN apt-get update && apt-get -t jessie-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 b/scripts/docker/build-debian9/Dockerfile
index f32d4a5c586..6e9966467c7 100644
--- a/scripts/docker/build-debian9/Dockerfile
+++ b/scripts/docker/build-debian9/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/debian9-source
+FROM freeradius/debian9-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN ./configure --prefix=/opt/freeradius
@@ -10,7 +10,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/debian9-source
+FROM freeradius/debian9-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-debian9/Dockerfile.source b/scripts/docker/build-debian9/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-debian9/Dockerfile.source
rename to scripts/docker/build-debian9/Dockerfile.deps
diff --git a/scripts/docker/build-debian9/Dockerfile.jenkins b/scripts/docker/build-debian9/Dockerfile.jenkins
index af3c7a7d50a..f437795a70c 100644
--- a/scripts/docker/build-debian9/Dockerfile.jenkins
+++ b/scripts/docker/build-debian9/Dockerfile.jenkins
@@ -1,11 +1,11 @@
-FROM freeradius/debian9-source
+FROM freeradius/debian9-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance
 #
 RUN echo deb http://ftp.debian.org/debian stretch-backports main >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t stretch-backports install -y openjdk-8-jre-headless 
-RUN apt-get install -y openssh-server sudo 
+RUN apt-get update && apt-get -t stretch-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-ubuntu14/Dockerfile b/scripts/docker/build-ubuntu14/Dockerfile
index 2ac1f188bf4..4b3bbf9ecf6 100644
--- a/scripts/docker/build-ubuntu14/Dockerfile
+++ b/scripts/docker/build-ubuntu14/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/ubuntu14-source
+FROM freeradius/ubuntu14-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN ./configure --prefix=/opt/freeradius
@@ -10,7 +10,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/ubuntu14-source
+FROM freeradius/ubuntu14-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-ubuntu14/Dockerfile.source b/scripts/docker/build-ubuntu14/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-ubuntu14/Dockerfile.source
rename to scripts/docker/build-ubuntu14/Dockerfile.deps
diff --git a/scripts/docker/build-ubuntu14/Dockerfile.jenkins b/scripts/docker/build-ubuntu14/Dockerfile.jenkins
index 6c45c2a6466..528e613f801 100644
--- a/scripts/docker/build-ubuntu14/Dockerfile.jenkins
+++ b/scripts/docker/build-ubuntu14/Dockerfile.jenkins
@@ -1,4 +1,4 @@
-FROM freeradius/ubuntu14-source
+FROM freeradius/ubuntu14-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance
diff --git a/scripts/docker/build-ubuntu16/Dockerfile b/scripts/docker/build-ubuntu16/Dockerfile
index 6e4bbe12fc5..83e79b9e720 100644
--- a/scripts/docker/build-ubuntu16/Dockerfile
+++ b/scripts/docker/build-ubuntu16/Dockerfile
@@ -1,4 +1,4 @@
-FROM freeradius/ubuntu16-source
+FROM freeradius/ubuntu16-deps
 
 WORKDIR /usr/local/src/repositories/freeradius-server
 RUN ./configure --prefix=/opt/freeradius
@@ -10,7 +10,7 @@ WORKDIR certs
 RUN make
 WORKDIR /
 
-FROM freeradius/ubuntu16-source
+FROM freeradius/ubuntu16-deps
 COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
diff --git a/scripts/docker/build-ubuntu16/Dockerfile.source b/scripts/docker/build-ubuntu16/Dockerfile.deps
similarity index 100%
rename from scripts/docker/build-ubuntu16/Dockerfile.source
rename to scripts/docker/build-ubuntu16/Dockerfile.deps
diff --git a/scripts/docker/build-ubuntu16/Dockerfile.jenkins b/scripts/docker/build-ubuntu16/Dockerfile.jenkins
index 91c6e666212..f3f7a7e6138 100644
--- a/scripts/docker/build-ubuntu16/Dockerfile.jenkins
+++ b/scripts/docker/build-ubuntu16/Dockerfile.jenkins
@@ -1,4 +1,4 @@
-FROM freeradius/ubuntu16-source
+FROM freeradius/ubuntu16-deps
 
 #
 #  This is necessary for the jenkins server to talk to the docker instance