jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Docker improvements (#5096)

Browse Source 
* install missing unzip
* run update and install in one step
* remove unused TRUSTED_HOSTS env
This commit is contained in:
Kevin Papst
2024-10-11 19:36:40 +02:00
committed by GitHub
parent b1b81ee8a6
commit 5fac6a642c
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.docker/000-default.conf
View File

@@ -8,7 +8,6 @@
PassEnv DATABASE_URL PassEnv DATABASE_URL
PassEnv MAILER_URL PassEnv MAILER_URL
PassEnv TRUSTED_PROXIES PassEnv TRUSTED_PROXIES
PassEnv TRUSTED_HOSTS
<Directory "/opt/kimai/public"> <Directory "/opt/kimai/public">
Require all granted Require all granted

8
Dockerfile
View File

@@ -78,8 +78,8 @@ RUN apk add --no-cache \
# apache debian php extension base # apache debian php extension base
FROM php:8.3-apache-bookworm AS apache-php-ext-base FROM php:8.3-apache-bookworm AS apache-php-ext-base
RUN apt-get update RUN apt-get update && \
RUN apt-get install -y \ apt-get install -y \
libldap2-dev \ libldap2-dev \
libicu-dev \ libicu-dev \
libpng-dev \ libpng-dev \
@@ -165,7 +165,8 @@ RUN apt-get update && \
libpng16-16 \ libpng16-16 \
libzip4 \ libzip4 \
libxslt1.1 \ libxslt1.1 \
libfreetype6 && \ libfreetype6 \
unzip && \
echo "Listen 8001" > /etc/apache2/ports.conf && \ echo "Listen 8001" > /etc/apache2/ports.conf && \
a2enmod rewrite && \ a2enmod rewrite && \
touch /use_apache 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 ENV APP_SECRET=change_this_to_something_unique
# The default container name for nginx is nginx # The default container name for nginx is nginx
ENV TRUSTED_PROXIES=nginx,localhost,127.0.0.1 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_FROM=kimai@example.com
ENV MAILER_URL=null://localhost ENV MAILER_URL=null://localhost
ENV ADMINPASS= ENV ADMINPASS=