From 7903c329f98f7ad1c04f6e14e595f6321c3aa5f1 Mon Sep 17 00:00:00 2001
From: chris <christiansteinle@arcor.de>
Date: Sun, 25 Feb 2024 07:34:26 +0100
Subject: [PATCH] Rebuild Dockerfile.

---
 Dockerfile          | 50 ++++++++++++++++++++++++++++++---------------
 docker-compose.yaml |  8 +++-----
 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e9c03b4..69f4f50 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,44 @@
-FROM php:7.4-apache
-
+FROM php:7.4-apache AS base
 ENV APACHE_DOCUMENT_ROOT /var/www/html
+WORKDIR ${APACHE_DOCUMENT_ROOT}
+
+RUN apt update && \
+    apt install -y \
+    libicu-dev=67.1-7 \
+    libgd-dev=2.3.0-2 \
+    libonig-dev=6.9.6-1.1 \
+    unzip=6.0-26 && \
+    apt purge -y --auto-remove && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
+RUN docker-php-ext-install \
+    exif \
+    gd \
+    intl \
+    mbstring \
+    mysqli \
+    pdo_mysql
+
+FROM composer:2 AS build
+WORKDIR ${APACHE_DOCUMENT_ROOT}
+
+COPY composer.json .
+COPY composer.lock .
+RUN composer install --no-dev --no-scripts --ignore-platform-reqs
+
+COPY . .
+RUN composer dumpautoload --optimize
+
+FROM base AS final
+COPY --from=build ${APACHE_DOCUMENT_ROOT} ${APACHE_DOCUMENT_ROOT}
 
-RUN sed -ri -e 's!/var/www/html!/var/www/html!g' /etc/apache2/sites-available/*.conf
 RUN sed -ri -e 's!/var/www/!/var/www/html!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
 RUN sed -ri -e 's!AllowOverride None!AllowOverride All!g' /etc/apache2/apache2.conf
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 RUN sed -ri -e 's!upload_max_filesize = 2M!upload_max_filesize = 8M!g' $PHP_INI_DIR/php.ini
 
-RUN a2enmod rewrite
-
-ARG UNAME=www-data
-ARG UGROUP=www-data
-ARG UID=1000
-ARG GID=1000
-
-RUN usermod --uid $UID $UNAME
-RUN groupmod --gid $GID $UGROUP
-
-WORKDIR ${APACHE_DOCUMENT_ROOT}
-
-COPY . ${APACHE_DOCUMENT_ROOT}
+RUN chown -R www-data:www-data ${APACHE_DOCUMENT_ROOT}
 
 VOLUME ${APACHE_DOCUMENT_ROOT}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index dee8ed2..b849382 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,14 +2,12 @@ version: '3'
 
 services:
   app:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: cs-git.ddnss.de/ri-st/startup
     container_name: startup-app
     ports:
       - '80:80'
-    volumes:
-      - ./:/var/www/html
+#    volumes:
+#      - ./:/var/www/html
     links:
       - db
     networks: