From: Nick Porter Date: Thu, 19 Jun 2025 09:53:01 +0000 (+0100) Subject: Newer docker is fussy about case X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba2b8a04d76d64e9e11d42d1371a83c15c4b0431;p=thirdparty%2Ffreeradius-server.git Newer docker is fussy about case --- diff --git a/scripts/docker/build/debian12/Dockerfile b/scripts/docker/build/debian12/Dockerfile index fea5ddeb625..62e4ad05b08 100644 --- a/scripts/docker/build/debian12/Dockerfile +++ b/scripts/docker/build/debian12/Dockerfile @@ -4,7 +4,7 @@ # Rebuild this file with `make docker.debian12.regen` # ARG from=debian:bookworm -FROM ${from} as build +FROM ${from} AS build ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/build/debian12/Dockerfile.cb b/scripts/docker/build/debian12/Dockerfile.cb index 172eda28249..16d009cb50d 100644 --- a/scripts/docker/build/debian12/Dockerfile.cb +++ b/scripts/docker/build/debian12/Dockerfile.cb @@ -4,7 +4,7 @@ # 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"] @@ -52,6 +52,7 @@ RUN apt-get install $APT_OPTS \ + # # Install some extra packages # diff --git a/scripts/docker/build/debiansid/Dockerfile b/scripts/docker/build/debiansid/Dockerfile index 02b10626e88..25f608c22d9 100644 --- a/scripts/docker/build/debiansid/Dockerfile +++ b/scripts/docker/build/debiansid/Dockerfile @@ -4,7 +4,7 @@ # Rebuild this file with `make docker.debiansid.regen` # ARG from=debian:sid -FROM ${from} as build +FROM ${from} AS build ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/build/debiansid/Dockerfile.cb b/scripts/docker/build/debiansid/Dockerfile.cb index d7ac545b5ba..7d6bf96ece6 100644 --- a/scripts/docker/build/debiansid/Dockerfile.cb +++ b/scripts/docker/build/debiansid/Dockerfile.cb @@ -4,7 +4,7 @@ # 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"] diff --git a/scripts/docker/build/rocky10/Dockerfile b/scripts/docker/build/rocky10/Dockerfile index 21d1d4d386a..fffc30bd391 100644 --- a/scripts/docker/build/rocky10/Dockerfile +++ b/scripts/docker/build/rocky10/Dockerfile @@ -4,7 +4,7 @@ # Rebuild this file with `make docker.rocky10.regen` # ARG from=rockylinux/rockylinux:10 -FROM ${from} as build +FROM ${from} AS build diff --git a/scripts/docker/build/rocky10/Dockerfile.cb b/scripts/docker/build/rocky10/Dockerfile.cb index 4b220a9c307..9209be9a698 100644 --- a/scripts/docker/build/rocky10/Dockerfile.cb +++ b/scripts/docker/build/rocky10/Dockerfile.cb @@ -4,7 +4,7 @@ # Rebuild this file with `make crossbuild.rocky10.regen` # ARG from=rockylinux/rockylinux:10 -FROM ${from} as build +FROM ${from} AS build # # Install devtools like make and git and the EPEL diff --git a/scripts/docker/build/rocky9/Dockerfile b/scripts/docker/build/rocky9/Dockerfile index 4cb02e3035c..45568320835 100644 --- a/scripts/docker/build/rocky9/Dockerfile +++ b/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 # diff --git a/scripts/docker/build/rocky9/Dockerfile.cb b/scripts/docker/build/rocky9/Dockerfile.cb index ab52b09991a..4b9bd32eb1c 100644 --- a/scripts/docker/build/rocky9/Dockerfile.cb +++ b/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 diff --git a/scripts/docker/build/ubuntu22/Dockerfile b/scripts/docker/build/ubuntu22/Dockerfile index 16b58a842d3..339b638009a 100644 --- a/scripts/docker/build/ubuntu22/Dockerfile +++ b/scripts/docker/build/ubuntu22/Dockerfile @@ -4,7 +4,7 @@ # Rebuild this file with `make docker.ubuntu22.regen` # ARG from=ubuntu:22.04 -FROM ${from} as build +FROM ${from} AS build ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/build/ubuntu22/Dockerfile.cb b/scripts/docker/build/ubuntu22/Dockerfile.cb index 173e1227e90..486b4392a84 100644 --- a/scripts/docker/build/ubuntu22/Dockerfile.cb +++ b/scripts/docker/build/ubuntu22/Dockerfile.cb @@ -4,7 +4,7 @@ # 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"] @@ -52,6 +52,7 @@ RUN apt-get install $APT_OPTS \ + # # Install some extra packages # diff --git a/scripts/docker/build/ubuntu24/Dockerfile b/scripts/docker/build/ubuntu24/Dockerfile index b341c1caaad..cbfae77b1dc 100644 --- a/scripts/docker/build/ubuntu24/Dockerfile +++ b/scripts/docker/build/ubuntu24/Dockerfile @@ -4,7 +4,7 @@ # Rebuild this file with `make docker.ubuntu24.regen` # ARG from=ubuntu:24.04 -FROM ${from} as build +FROM ${from} AS build ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/build/ubuntu24/Dockerfile.cb b/scripts/docker/build/ubuntu24/Dockerfile.cb index 7907bbf626b..e099653c504 100644 --- a/scripts/docker/build/ubuntu24/Dockerfile.cb +++ b/scripts/docker/build/ubuntu24/Dockerfile.cb @@ -4,7 +4,7 @@ # Rebuild this file with `make crossbuild.ubuntu24.regen` # ARG from=ubuntu:24.04 -FROM ${from} as build +FROM ${from} AS build SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"] @@ -52,6 +52,7 @@ RUN apt-get install $APT_OPTS \ + # # Install some extra packages # diff --git a/scripts/docker/m4/crossbuild.deb.m4 b/scripts/docker/m4/crossbuild.deb.m4 index 8896821213a..2ad3ea5bdd7 100644 --- a/scripts/docker/m4/crossbuild.deb.m4 +++ b/scripts/docker/m4/crossbuild.deb.m4 @@ -1,5 +1,5 @@ ARG from=DOCKER_IMAGE -FROM ${from} as build +FROM ${from} AS build SHELL ["/usr/bin/nice", "-n", "5", "/usr/bin/ionice", "-c", "3", "/bin/sh", "-x", "-c"] diff --git a/scripts/docker/m4/crossbuild.rpm.m4 b/scripts/docker/m4/crossbuild.rpm.m4 index 26181aebdf7..4a23d7e0147 100644 --- a/scripts/docker/m4/crossbuild.rpm.m4 +++ b/scripts/docker/m4/crossbuild.rpm.m4 @@ -1,5 +1,5 @@ ARG from=DOCKER_IMAGE -FROM ${from} as build +FROM ${from} AS build # # Install devtools like make and git and the EPEL diff --git a/scripts/docker/m4/docker.deb.m4 b/scripts/docker/m4/docker.deb.m4 index ceec8943897..0eaeb3c5841 100644 --- a/scripts/docker/m4/docker.deb.m4 +++ b/scripts/docker/m4/docker.deb.m4 @@ -1,5 +1,5 @@ ARG from=DOCKER_IMAGE -FROM ${from} as build +FROM ${from} AS build ARG DEBIAN_FRONTEND=noninteractive diff --git a/scripts/docker/m4/docker.rpm.m4 b/scripts/docker/m4/docker.rpm.m4 index 477cd7c3ff6..46fdec7bdb4 100644 --- a/scripts/docker/m4/docker.rpm.m4 +++ b/scripts/docker/m4/docker.rpm.m4 @@ -1,5 +1,5 @@ ARG from=DOCKER_IMAGE -FROM ${from} as build +FROM ${from} AS build ifelse(OS_VER, 8, `dnl RUN rpmkeys --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rockyofficial