From 40acc2108ba00ac49e8768cde612fe6420f70da7 Mon Sep 17 00:00:00 2001 From: Jason Dove Date: Mon, 8 Mar 2021 07:36:45 -0600 Subject: [PATCH] include tzdata in docker to support TZ env var again --- docker/Dockerfile | 2 +- docker/docker-compose.yml | 2 ++ docker/nvidia/Dockerfile | 2 +- docker/vaapi/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f924b4cf3..a7e9fe1bf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM jrottenberg/ffmpeg:4.3-ubuntu2004 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet -RUN apt-get update && apt-get install -y libicu-dev +RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata # https://hub.docker.com/_/microsoft-dotnet FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a1d8b5eaf..afb9cb863 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,6 +7,8 @@ services: dockerfile: docker/Dockerfile args: INFO_VERSION: "docker-compose-develop" + environment: + TZ: America/Chicago ports: - "8409:8409" volumes: diff --git a/docker/nvidia/Dockerfile b/docker/nvidia/Dockerfile index 935e4d27f..e7625f9b5 100644 --- a/docker/nvidia/Dockerfile +++ b/docker/nvidia/Dockerfile @@ -2,7 +2,7 @@ FROM jrottenberg/ffmpeg:4.3-nvidia1804 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet -RUN apt-get update && apt-get install -y libicu-dev +RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata # https://hub.docker.com/_/microsoft-dotnet FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build diff --git a/docker/vaapi/Dockerfile b/docker/vaapi/Dockerfile index 694ce37a0..840bc5e40 100644 --- a/docker/vaapi/Dockerfile +++ b/docker/vaapi/Dockerfile @@ -2,7 +2,7 @@ FROM jrottenberg/ffmpeg:4.3-vaapi1804 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet -RUN apt-get update && apt-get install -y libicu-dev +RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata # https://hub.docker.com/_/microsoft-dotnet FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build