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

diff --git a/scripts/docker/build-centos6/Dockerfile b/scripts/docker/build-centos6/Dockerfile
index 10dc15b54c6fdf6d6ec0e9982079144e24b22f79..20a45dc5fbfe3e8563c0f0dc6a17338e1ba4f231 100644 (file)
--- 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 32b9ce5464e15e36fa5f8001f33fb3946b2cb79d..84430038030afd467d8e2aa6f137b41316f63c76 100644 (file)
--- 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 958b32198046417350bf0daf0c77e5f8a474ce08..aafb48655c137da96afe009765292eb4a4d95460 100644 (file)
--- 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 88c57e1582b3a4bbd0e1e5c585c9e988c597c99c..6e1dc0be12468a5e0429274986a8e3b8e0186bf7 100644 (file)
--- 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 3b76717431a948a8d22af1d9eb2bf881066930b2..eef1ba9395e31baf9a1531af6ab58369921c4bf5 100644 (file)
--- 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 42fc5e3783c29b0962ce64067feea18ef1a228a9..6ffb0be990c908d24c0bd7de542ffbd02a65ce93 100644 (file)
--- 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 312ef4c2ec37aee98a15ed3ddb2bf552196c59de..de7a24907829b95e2e6ae2d58d8c6b067a76d10e 100644 (file)
--- 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 9fc0969620005d3cbe261cd2f3dcbd93c223fdca..007b8317901389154fc20b408303c60862e9513e 100644 (file)
--- 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 f32d4a5c5866ac43862e23374348f7dfa89a4165..6e9966467c7f10d181ea42432dd2eb2aa4e6b709 100644 (file)
--- 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 af3c7a7d50abdb0521ce66f2fa26e2d26e5ff076..f437795a70c924cef1dac30a484c45de267f336b 100644 (file)
--- 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 2ac1f188bf492d621495636487f00a9ecbaee045..4b3bbf9ecf6df8ff002ffd8651eaee945746c2cb 100644 (file)
--- 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 6c45c2a646692336bbbb2a60fa434c0b41dedd43..528e613f8013016653889e249dc4f53da161b06c 100644 (file)
--- 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 6e4bbe12fc53daac9696ff8a12d2063ad4afb370..83e79b9e7205a160fefd9640b21227dda30d1f93 100644 (file)
--- 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 91c6e66621258770ed5778a6d969a093bdd28b21..f3f7a7e613823ab326ab848ff08155d7c73f4cd0 100644 (file)
--- 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