From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Thu, 12 Aug 2021 21:56:09 +0000 (+0100)
Subject: more consistent dockerfiles
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d79f1166abfc874fc6f80f83a7cfa29d14f4a18;p=thirdparty%2Ffreeradius-server.git

more consistent dockerfiles
---

diff --git a/scripts/docker/build-centos7/Dockerfile b/scripts/docker/build-centos7/Dockerfile
index eea693991d7..472125630b9 100644
--- a/scripts/docker/build-centos7/Dockerfile
+++ b/scripts/docker/build-centos7/Dockerfile
@@ -1,16 +1,20 @@
 ARG from=freeradius/centos7-deps
 FROM ${from}
 
+SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
+
 ARG cc=gcc
+ARG branch=master
+ARG dh_key_size=2048
 
 WORKDIR /usr/local/src/repositories/freeradius-server
-RUN CC=${cc} scl enable devtoolset-8 './configure --prefix=/opt/freeradius'
-RUN scl enable devtoolset-8 'make -j2'
+RUN git checkout ${branch}
+RUN CC=${cc} scl enable devtoolset-8 './configure --prefix=/opt/freeradius --with-jsonc-lib-dir=/opt/nwkrad/lib64 --with-jsonc-include-dir=/opt/nwkrad/include --with-openssl-lib-dir=/opt/nwkrad/lib64 --with-openssl-include-dir=/opt/nwkrad/include'
+RUN scl enable devtoolset-8 'make -j$(($(getconf _NPROCESSORS_ONLN) + 1))'
 RUN scl enable devtoolset-8 'make install'
 WORKDIR /opt/freeradius/etc/raddb
 RUN sed -i -e 's/allow_vulnerable_openssl.*/allow_vulnerable_openssl = yes/' radiusd.conf
-WORKDIR certs
-RUN make
+RUN make -C certs DH_KEY_SIZE=$dh_key_size
 WORKDIR /
 
 FROM ${from}
@@ -18,4 +22,3 @@ COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
 CMD ["/opt/freeradius/sbin/radiusd", "-X"]
-
diff --git a/scripts/docker/build-debian10/Dockerfile b/scripts/docker/build-debian10/Dockerfile
index c01c57bc142..e845a662142 100644
--- a/scripts/docker/build-debian10/Dockerfile
+++ b/scripts/docker/build-debian10/Dockerfile
@@ -3,8 +3,6 @@ FROM ${from}
 
 SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
 
-ARG from=freeradius/debian10-deps
-
 ARG cc=gcc
 ARG branch=master
 ARG dh_key_size=2048
diff --git a/scripts/docker/build-debian9/Dockerfile b/scripts/docker/build-debian9/Dockerfile
index 34da824a6a1..245deb8ae88 100644
--- a/scripts/docker/build-debian9/Dockerfile
+++ b/scripts/docker/build-debian9/Dockerfile
@@ -3,8 +3,6 @@ FROM ${from}
 
 SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
 
-ARG from=freeradius/debian9-deps
-
 ARG cc=gcc
 ARG branch=master
 ARG dh_key_size=2048
diff --git a/scripts/docker/build-debiansid/Dockerfile b/scripts/docker/build-debiansid/Dockerfile
index 9ab0a2ce789..ce358a0b7a3 100644
--- a/scripts/docker/build-debiansid/Dockerfile
+++ b/scripts/docker/build-debiansid/Dockerfile
@@ -3,8 +3,6 @@ FROM ${from}
 
 SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
 
-ARG from=freeradius/debiansid-deps
-
 ARG cc=gcc
 ARG branch=master
 ARG dh_key_size=2048
diff --git a/scripts/docker/build-ubuntu18/Dockerfile b/scripts/docker/build-ubuntu18/Dockerfile
index e285b23f9e4..5f475650f2d 100644
--- a/scripts/docker/build-ubuntu18/Dockerfile
+++ b/scripts/docker/build-ubuntu18/Dockerfile
@@ -1,16 +1,20 @@
 ARG from=freeradius/ubuntu18-deps
 FROM ${from}
 
+SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
+
 ARG cc=gcc
+ARG branch=master
+ARG dh_key_size=2048
 
 WORKDIR /usr/local/src/repositories/freeradius-server
+RUN git checkout ${branch}
 RUN CC=${cc} ./configure --prefix=/opt/freeradius
-RUN make -j2
+RUN make -j$(($(getconf _NPROCESSORS_ONLN) + 1))
 RUN make install
 WORKDIR /opt/freeradius/etc/raddb
 RUN sed -i -e 's/allow_vulnerable_openssl.*/allow_vulnerable_openssl = yes/' radiusd.conf
-WORKDIR certs
-RUN make
+RUN make -C certs DH_KEY_SIZE=$dh_key_size
 WORKDIR /
 
 FROM ${from}
@@ -18,4 +22,3 @@ COPY --from=0 /opt/freeradius /opt/freeradius
 
 EXPOSE 1812/udp 1813/udp
 CMD ["/opt/freeradius/sbin/radiusd", "-X"]
-
diff --git a/scripts/docker/build-ubuntu20/Dockerfile b/scripts/docker/build-ubuntu20/Dockerfile
index c64dbb75133..3cc1e38ee0a 100644
--- a/scripts/docker/build-ubuntu20/Dockerfile
+++ b/scripts/docker/build-ubuntu20/Dockerfile
@@ -3,8 +3,6 @@ FROM ${from}
 
 SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"]
 
-ARG from=freeradius/ubuntu20-deps
-
 ARG cc=gcc
 ARG branch=master
 ARG dh_key_size=2048