From 5fac6a642ca309d84f474588474fdf4339df58e2 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Fri, 11 Oct 2024 19:36:40 +0200 Subject: [PATCH] Docker improvements (#5096) * install missing unzip * run update and install in one step * remove unused TRUSTED_HOSTS env --- .docker/000-default.conf | 1 - Dockerfile | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.docker/000-default.conf b/.docker/000-default.conf index fb8f28c8..2e64a4dd 100644 --- a/.docker/000-default.conf +++ b/.docker/000-default.conf @@ -8,7 +8,6 @@ PassEnv DATABASE_URL PassEnv MAILER_URL PassEnv TRUSTED_PROXIES - PassEnv TRUSTED_HOSTS Require all granted diff --git a/Dockerfile b/Dockerfile index 6adeb3fb..63e87dc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -78,8 +78,8 @@ RUN apk add --no-cache \ # apache debian php extension base FROM php:8.3-apache-bookworm AS apache-php-ext-base -RUN apt-get update -RUN apt-get install -y \ +RUN apt-get update && \ + apt-get install -y \ libldap2-dev \ libicu-dev \ libpng-dev \ @@ -165,7 +165,8 @@ RUN apt-get update && \ libpng16-16 \ libzip4 \ libxslt1.1 \ - libfreetype6 && \ + libfreetype6 \ + unzip && \ echo "Listen 8001" > /etc/apache2/ports.conf && \ a2enmod rewrite && \ touch /use_apache @@ -264,7 +265,6 @@ ENV DATABASE_URL="mysql://kimai:kimai@127.0.0.1:3306/kimai?charset=utf8mb4&serve ENV APP_SECRET=change_this_to_something_unique # The default container name for nginx is nginx ENV TRUSTED_PROXIES=nginx,localhost,127.0.0.1 -ENV TRUSTED_HOSTS=nginx,localhost,127.0.0.1 ENV MAILER_FROM=kimai@example.com ENV MAILER_URL=null://localhost ENV ADMINPASS=