From 8913392f613dcfca78a5615398a2dc59ad6ff235 Mon Sep 17 00:00:00 2001
From: Kris Lamoureux <kris@lamoureux.io>
Date: Tue, 17 Jun 2025 21:56:23 -0400
Subject: [PATCH] testing

---
 Dockerfile         | 34 ++++++++++++++++++++++++----------
 docker-compose.yml |  2 --
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index abfc312..5690b4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,36 @@
-FROM php:7.4-apache-bullseye
-ARG URL=https://www.timetrex.com/direct_download/TimeTrex_Community_Edition-manual-installer.zip
+FROM php:8.2-apache-bookworm
+
+ARG BASE_URL=https://www.timetrex.com/direct_download
+ARG FILENAME=TimeTrex_Community_Edition-manual-installer.zip
+ARG URL=${BASE_URL}/${FILENAME}
 
 # Install PHP extensions
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-        libarchive-tools \
-        libpq-dev \
-        zlib1g-dev \
-        libpng-dev \
-        libicu-dev \
-        libxml2-dev \
-        libzip-dev \
+    libarchive-tools \
+    libpq-dev \
+    zlib1g-dev \
+    libpng-dev \
+    libicu-dev \
+    libxml2-dev \
+    libzip-dev \
+    libpspell-dev \
+    libc-client-dev \
+    libkrb5-dev \
+    libxslt1-dev \
+    libldap2-dev \
+    libonig-dev \
     && rm -rf /var/lib/apt/lists/*
-RUN docker-php-ext-install pgsql gd gettext intl soap zip bcmath
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+    && docker-php-ext-install pgsql pspell gd gettext imap intl soap zip ldap \
+    xml xsl mbstring bcmath
 RUN ln -s "$(which php)" /usr/bin/php
 
 # Download and place TimeTrex
 RUN curl -s "$URL" | bsdtar -xf- -C /var/www/html/ && \
+    bash -c 'shopt -s dotglob && \
+    cp -r /var/www/html/TimeTrex_*/* /var/www/html/' && \
+    shopt -s dotglob && \
     cp -r /var/www/html/TimeTrex_*/* /var/www/html/ && \
     rm -rf /var/www/html/TimeTrex_* && \
     cp timetrex.ini.php-example_linux timetrex.ini.php
diff --git a/docker-compose.yml b/docker-compose.yml
index ad158c6..2bfab37 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   timetrex:
     build: .