Docker misc improvements

scripts/docker/README.md

@@ -29,7 +29,7 @@ Each directory has several dockerfiles:
 As with any Dockerfile you'll first need to build the image:
 
 ```bash
-cd scripts/docker/build-<os_name>
+cd scripts/docker/build/<os_name>
 docker build -f Dockerfile.deps -t freeradius/<os_name>-deps .
 ```
 

scripts/docker/build/debian12/Dockerfile

@@ -4,15 +4,23 @@
 # Rebuild this file with `make docker.debian12.regen`
 #
 ARG from=debian:bookworm
-FROM ${from} as build
+FROM ${from} AS build
+
+ARG APT_OPTS="-y --no-install-recommends"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 #
 #  Install build tools
 #
-RUN apt-get update
-RUN apt-get install -y devscripts equivs git quilt gcc curl
+RUN apt-get update \
+ && apt-get install $APT_OPTS \
+        devscripts \
+        equivs \
+        git \
+        quilt \
+        gcc \
+        curl
 
 #
 #  Set up NetworkRADIUS extras repository
@@ -57,6 +65,7 @@ RUN make -j$(nproc) deb
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG APT_OPTS="-y --no-install-recommends"
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
@@ -65,7 +74,7 @@ COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 #  We need curl to get the signing key
 #
 RUN apt-get update \
- && apt-get install -y curl \
+ && apt-get install $APT_OPTS ca-certificates curl \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/*
 
@@ -85,7 +94,6 @@ RUN groupadd -g ${freerad_gid} -r freerad \
  && apt-get install -y /tmp/*.deb \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/* /tmp/*.deb \
-    \
  && ln -s /etc/freeradius /etc/raddb
 
 WORKDIR /

scripts/docker/build/debian12/Dockerfile.cb

@@ -4,22 +4,19 @@
 # Rebuild this file with `make crossbuild.debian12.regen`
 #
 ARG from=debian:bookworm
-FROM ${from} as build
+FROM ${from} AS build
 
 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
 
-
 #
-#  Install add-apt-repository (may be needed for clang) and
-#  package development utilities
+#  Install build tools
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -37,8 +34,8 @@ RUN apt-get update && \
 #  Set up NetworkRADIUS extras repository
 #
 RUN install -d -o root -g root -m 0755 /etc/apt/keyrings && \
-    wget -O /etc/apt/keyrings/packages.networkradius.com.asc "https://packages.networkradius.com/pgp/packages%40networkradius.com" && \
-    echo "deb [signed-by=/etc/apt/keyrings/packages.networkradius.com.asc] http://packages.networkradius.com/extras/debian/bookworm bookworm main" > /etc/apt/sources.list.d/networkradius-extras.list && \
+    wget -qO- https://packages.networkradius.com/pgp/packages%40networkradius.com | tee /etc/apt/trusted.gpg.d/packages.networkradius.com.asc && \
+    echo "deb http://packages.networkradius.com/extras/debian/bookworm bookworm main" > /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update
 
 
@@ -52,6 +49,7 @@ RUN apt-get install $APT_OPTS \
 
 
 
+
 #
 #  Install some extra packages
 #

scripts/docker/build/debiansid/Dockerfile

@@ -4,15 +4,23 @@
 # Rebuild this file with `make docker.debiansid.regen`
 #
 ARG from=debian:sid
-FROM ${from} as build
+FROM ${from} AS build
+
+ARG APT_OPTS="-y --no-install-recommends"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 #
 #  Install build tools
 #
-RUN apt-get update
-RUN apt-get install -y devscripts equivs git quilt gcc curl
+RUN apt-get update \
+ && apt-get install $APT_OPTS \
+        devscripts \
+        equivs \
+        git \
+        quilt \
+        gcc \
+        curl
 
 #
 #  Set up NetworkRADIUS extras repository
@@ -57,6 +65,7 @@ RUN make -j$(nproc) deb
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG APT_OPTS="-y --no-install-recommends"
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
@@ -65,7 +74,7 @@ COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 #  We need curl to get the signing key
 #
 RUN apt-get update \
- && apt-get install -y curl \
+ && apt-get install $APT_OPTS ca-certificates curl \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/*
 
@@ -85,7 +94,6 @@ RUN groupadd -g ${freerad_gid} -r freerad \
  && apt-get install -y /tmp/*.deb \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/* /tmp/*.deb \
-    \
  && ln -s /etc/freeradius /etc/raddb
 
 WORKDIR /

scripts/docker/build/debiansid/Dockerfile.cb

@@ -4,22 +4,19 @@
 # Rebuild this file with `make crossbuild.debiansid.regen`
 #
 ARG from=debian:sid
-FROM ${from} as build
+FROM ${from} AS build
 
 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
 
-
 #
-#  Install add-apt-repository (may be needed for clang) and
-#  package development utilities
+#  Install build tools
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -37,8 +34,8 @@ RUN apt-get update && \
 #  Set up NetworkRADIUS extras repository
 #
 RUN install -d -o root -g root -m 0755 /etc/apt/keyrings && \
-    wget -O /etc/apt/keyrings/packages.networkradius.com.asc "https://packages.networkradius.com/pgp/packages%40networkradius.com" && \
-    echo "deb [signed-by=/etc/apt/keyrings/packages.networkradius.com.asc] http://packages.networkradius.com/extras/debian/sid sid main" > /etc/apt/sources.list.d/networkradius-extras.list && \
+    wget -qO- https://packages.networkradius.com/pgp/packages%40networkradius.com | tee /etc/apt/trusted.gpg.d/packages.networkradius.com.asc && \
+    echo "deb http://packages.networkradius.com/extras/debian/sid sid main" > /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update
 
 

scripts/docker/build/rocky9/Dockerfile

@@ -4,10 +4,11 @@
 # Rebuild this file with `make docker.rocky9.regen`
 #
 ARG from=rockylinux/rockylinux:9
-FROM ${from} as build
+FROM ${from} AS build
 
 RUN rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
 
+
 #
 #  Install build tools
 #

scripts/docker/build/rocky9/Dockerfile.cb

@@ -4,7 +4,7 @@
 # Rebuild this file with `make crossbuild.rocky9.regen`
 #
 ARG from=rockylinux/rockylinux:9
-FROM ${from} as build
+FROM ${from} AS build
 
 #
 #  Install devtools like make and git and the EPEL

scripts/docker/build/ubuntu22/Dockerfile

@@ -4,15 +4,23 @@
 # Rebuild this file with `make docker.ubuntu22.regen`
 #
 ARG from=ubuntu:22.04
-FROM ${from} as build
+FROM ${from} AS build
+
+ARG APT_OPTS="-y --no-install-recommends"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 #
 #  Install build tools
 #
-RUN apt-get update
-RUN apt-get install -y devscripts equivs git quilt gcc curl
+RUN apt-get update \
+ && apt-get install $APT_OPTS \
+        devscripts \
+        equivs \
+        git \
+        quilt \
+        gcc \
+        curl
 
 #
 #  Set up NetworkRADIUS extras repository
@@ -57,6 +65,7 @@ RUN make -j$(nproc) deb
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG APT_OPTS="-y --no-install-recommends"
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
@@ -65,7 +74,7 @@ COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 #  We need curl to get the signing key
 #
 RUN apt-get update \
- && apt-get install -y curl \
+ && apt-get install $APT_OPTS ca-certificates curl \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/*
 
@@ -85,7 +94,6 @@ RUN groupadd -g ${freerad_gid} -r freerad \
  && apt-get install -y /tmp/*.deb \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/* /tmp/*.deb \
-    \
  && ln -s /etc/freeradius /etc/raddb
 
 WORKDIR /

scripts/docker/build/ubuntu22/Dockerfile.cb

@@ -4,22 +4,19 @@
 # Rebuild this file with `make crossbuild.ubuntu22.regen`
 #
 ARG from=ubuntu:22.04
-FROM ${from} as build
+FROM ${from} AS build
 
 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
 
-
 #
-#  Install add-apt-repository (may be needed for clang) and
-#  package development utilities
+#  Install build tools
 #
 RUN apt-get update && \
     apt-get install $APT_OPTS \
-        software-properties-common \
         devscripts \
         equivs \
         git \
@@ -37,8 +34,8 @@ RUN apt-get update && \
 #  Set up NetworkRADIUS extras repository
 #
 RUN install -d -o root -g root -m 0755 /etc/apt/keyrings && \
-    wget -O /etc/apt/keyrings/packages.networkradius.com.asc "https://packages.networkradius.com/pgp/packages%40networkradius.com" && \
-    echo "deb [signed-by=/etc/apt/keyrings/packages.networkradius.com.asc] http://packages.networkradius.com/extras/ubuntu/jammy jammy main" > /etc/apt/sources.list.d/networkradius-extras.list && \
+    wget -qO- https://packages.networkradius.com/pgp/packages%40networkradius.com | tee /etc/apt/trusted.gpg.d/packages.networkradius.com.asc && \
+    echo "deb http://packages.networkradius.com/extras/ubuntu/jammy jammy main" > /etc/apt/sources.list.d/networkradius-extras.list && \
     apt-get update
 
 
@@ -52,6 +49,7 @@ RUN apt-get install $APT_OPTS \
 
 
 
+
 #
 #  Install some extra packages
 #

scripts/docker/build/ubuntu24/Dockerfile

@@ -4,15 +4,23 @@
 # Rebuild this file with `make docker.ubuntu24.regen`
 #
 ARG from=ubuntu:24.04
-FROM ${from} as build
+FROM ${from} AS build
+
+ARG APT_OPTS="-y --no-install-recommends"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 #
 #  Install build tools
 #
-RUN apt-get update
-RUN apt-get install -y devscripts equivs git quilt gcc curl
+RUN apt-get update \
+ && apt-get install $APT_OPTS \
+        devscripts \
+        equivs \
+        git \
+        quilt \
+        gcc \
+        curl
 
 #
 #  Set up NetworkRADIUS extras repository
@@ -57,6 +65,7 @@ RUN make -j$(nproc) deb
 #  Clean environment and run the server
 #
 FROM ${from}
+ARG APT_OPTS="-y --no-install-recommends"
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY --from=build /usr/local/src/repositories/*.deb /tmp/
@@ -65,7 +74,7 @@ COPY --from=build /usr/local/src/repositories/*.deb /tmp/
 #  We need curl to get the signing key
 #
 RUN apt-get update \
- && apt-get install -y curl \
+ && apt-get install $APT_OPTS ca-certificates curl \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/*
 
@@ -85,7 +94,6 @@ RUN groupadd -g ${freerad_gid} -r freerad \
  && apt-get install -y /tmp/*.deb \
  && apt-get clean \
  && rm -r /var/lib/apt/lists/* /tmp/*.deb \
-    \
  && ln -s /etc/freeradius /etc/raddb
 
 WORKDIR /