From: Matthew Newton Date: Tue, 28 May 2024 14:31:43 +0000 (+0100) Subject: docker: install tzdata in deb images X-Git-Tag: release_3_2_4~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aa63da85dd1a8c6bbc2ae5ac92bf1238da47664;p=thirdparty%2Ffreeradius-server.git docker: install tzdata in deb images fixes #5315 --- diff --git a/scripts/docker/dists/debian10/Dockerfile b/scripts/docker/dists/debian10/Dockerfile index ca2722e5cbf..c12b6943ca0 100644 --- a/scripts/docker/dists/debian10/Dockerfile +++ b/scripts/docker/dists/debian10/Dockerfile @@ -60,7 +60,10 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + RUN apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/debian11/Dockerfile b/scripts/docker/dists/debian11/Dockerfile index 918512beacb..db53e521fbc 100644 --- a/scripts/docker/dists/debian11/Dockerfile +++ b/scripts/docker/dists/debian11/Dockerfile @@ -60,12 +60,15 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ARG freerad_uid=101 ARG freerad_gid=101 RUN groupadd -g ${freerad_gid} -r freerad \ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \ && apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/debian12/Dockerfile b/scripts/docker/dists/debian12/Dockerfile index 5eb2af44e72..18151550195 100644 --- a/scripts/docker/dists/debian12/Dockerfile +++ b/scripts/docker/dists/debian12/Dockerfile @@ -60,12 +60,15 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ARG freerad_uid=101 ARG freerad_gid=101 RUN groupadd -g ${freerad_gid} -r freerad \ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \ && apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/debiansid/Dockerfile b/scripts/docker/dists/debiansid/Dockerfile index 3a2f9432c4a..5194cd0bc29 100644 --- a/scripts/docker/dists/debiansid/Dockerfile +++ b/scripts/docker/dists/debiansid/Dockerfile @@ -60,12 +60,15 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ARG freerad_uid=101 ARG freerad_gid=101 RUN groupadd -g ${freerad_gid} -r freerad \ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \ && apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/ubuntu18/Dockerfile b/scripts/docker/dists/ubuntu18/Dockerfile index 1e1d02ff935..d9aaeb628a2 100644 --- a/scripts/docker/dists/ubuntu18/Dockerfile +++ b/scripts/docker/dists/ubuntu18/Dockerfile @@ -60,7 +60,10 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + RUN apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/ubuntu20/Dockerfile b/scripts/docker/dists/ubuntu20/Dockerfile index a42b1809d01..19981b247c3 100644 --- a/scripts/docker/dists/ubuntu20/Dockerfile +++ b/scripts/docker/dists/ubuntu20/Dockerfile @@ -60,7 +60,10 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + RUN apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/ubuntu22/Dockerfile b/scripts/docker/dists/ubuntu22/Dockerfile index 4bebcf1f7d1..5c2cd11d821 100644 --- a/scripts/docker/dists/ubuntu22/Dockerfile +++ b/scripts/docker/dists/ubuntu22/Dockerfile @@ -60,12 +60,15 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ARG freerad_uid=101 ARG freerad_gid=101 RUN groupadd -g ${freerad_gid} -r freerad \ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \ && apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/dists/ubuntu24/Dockerfile b/scripts/docker/dists/ubuntu24/Dockerfile index 05d1f7d5d06..98d3eb3c2ed 100644 --- a/scripts/docker/dists/ubuntu24/Dockerfile +++ b/scripts/docker/dists/ubuntu24/Dockerfile @@ -60,12 +60,15 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ARG freerad_uid=101 ARG freerad_gid=101 RUN groupadd -g ${freerad_gid} -r freerad \ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \ && apt-get update \ + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \ diff --git a/scripts/docker/m4/Dockerfile.deb.m4 b/scripts/docker/m4/Dockerfile.deb.m4 index c8a5eec5c5d..1895b6b8b9c 100644 --- a/scripts/docker/m4/Dockerfile.deb.m4 +++ b/scripts/docker/m4/Dockerfile.deb.m4 @@ -55,6 +55,8 @@ ARG DEBIAN_FRONTEND=noninteractive COPY --from=build /usr/local/src/repositories/*.deb /tmp/ +RUN ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime + ifelse(ifelse( D_NAME, `debian10', no, D_NAME, `ubuntu18', no, @@ -67,6 +69,7 @@ RUN groupadd -g ${freerad_gid} -r freerad \ && useradd -u ${freerad_uid} -g freerad -r -M -d /etc/freeradius -s /usr/sbin/nologin freerad \ && apt-get update \', `RUN apt-get update \') + && apt-get install -y tzdata \ && apt-get install -y /tmp/*.deb \ && apt-get clean \ && rm -r /var/lib/apt/lists/* /tmp/*.deb \