full

Author: mkalkbrenner

docker/Dockerfile

@@ -3,14 +3,15 @@ FROM php:8.3-apache
 # Set working directory for build context
 WORKDIR /usr/src
 
-# Install all dependencies including oniguruma
+# Combined installation and configuration
 RUN apt-get update && apt-get install -y \
     wget make gcc g++ \
     libjpeg-dev libpng-dev libwebp-dev zlib1g-dev \
     unzip git apache2-dev libxml2-dev \
     libsqlite3-dev pkg-config libzip-dev \
     libcurl4-openssl-dev ca-certificates \
     libonig-dev && \
+    \
     # Build and install SQLite
     wget https://www.sqlite.org/2025/sqlite-autoconf-3490100.tar.gz && \
     tar xzf sqlite-autoconf-3490100.tar.gz && \
@@ -20,10 +21,12 @@ RUN apt-get update && apt-get install -y \
     make install && \
     cd .. && \
     rm -rf sqlite-autoconf-3490100* && \
+    \
     # Update system SQLite
     cp /usr/local/bin/sqlite3 /usr/bin/sqlite3 && \
     cp /usr/local/lib/libsqlite3.so* /usr/lib/ && \
     ldconfig && \
+    \
     # Rebuild PHP
     docker-php-source extract && \
     cd /usr/src/php && \
@@ -39,27 +42,38 @@ RUN apt-get update && apt-get install -y \
     make -j$(nproc) && \
     make install && \
     docker-php-source delete && \
+    \
     # Install PHP extensions
     docker-php-ext-configure gd --with-jpeg --with-webp && \
     docker-php-ext-install gd curl mbstring && \
-    # Clean up
+    \
+    # Clean up build dependencies
     apt-get purge -y --auto-remove wget make gcc g++ && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-    # PHP config
+    \
+    # PHP configuration
     cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
     update-ca-certificates && \
     echo "allow_url_fopen = On" >> /usr/local/etc/php/conf.d/drupal.ini && \
     echo "openssl.cafile = /etc/ssl/certs/ca-certificates.crt" >> /usr/local/etc/php/conf.d/drupal.ini && \
-    # Apache config
+    \
+    # Apache configuration
     a2enmod rewrite && \
-    echo "DocumentRoot /var/www/web" > /etc/apache2/conf-available/document-root.conf && \
-    echo "<Directory /var/www/web>" >> /etc/apache2/conf-available/document-root.conf && \
-    echo "    Options Indexes FollowSymLinks" >> /etc/apache2/conf-available/document-root.conf && \
-    echo "    AllowOverride All" >> /etc/apache2/conf-available/document-root.conf && \
-    echo "    Require all granted" >> /etc/apache2/conf-available/document-root.conf && \
-    echo "</Directory>" >> /etc/apache2/conf-available/document-root.conf && \
-    a2enconf document-root
+    echo "<VirtualHost *:80>\n\
+        DocumentRoot /var/www/web\n\
+        <Directory /var/www/web>\n\
+            Options -Indexes +FollowSymLinks\n\
+            AllowOverride All\n\
+            Require all granted\n\
+            DirectoryIndex index.php\n\
+        </Directory>\n\
+    </VirtualHost>" > /etc/apache2/sites-available/000-default.conf && \
+    rm -f /etc/apache2/sites-enabled/000-default.conf && \
+    ln -s /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-enabled/ && \
+    \
+    # Final cleanup
+    rm -rf /usr/src/*
 
 WORKDIR /var/www
 COPY --chown=www-data:www-data web/ web/
@@ -69,7 +83,8 @@ COPY docker/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
 WORKDIR /var/www/web
-ENV DRUPAL_DOCKER=1
+ENV APACHE_DOCUMENT_ROOT=/var/www/web \
+    DRUPAL_DOCKER=1
 
 ENTRYPOINT ["/entrypoint.sh"]
 EXPOSE 80