From eb36eb4ba3057eeb41d40b7a0d1b51ae25d8a4fa Mon Sep 17 00:00:00 2001
From: Jonas Leder <git@jonasled.de>
Date: Wed, 24 Mar 2021 23:46:18 +0100
Subject: [PATCH] switch to new docker container

---
 Dockerfile | 41 +++++++++--------------------------------
 1 file changed, 9 insertions(+), 32 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2676bc9..9b8de60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,47 +8,24 @@ RUN yarn install
 RUN yarn compile
 
 # Prepare Webserver
-ARG INSTALL_CRON=0
-ARG INSTALL_COMPOSER=0
-ARG PHP_VERSION
-ARG GLOBAL_VERSION
-FROM thecodingmachine/php:8.0-v4-slim-apache
+FROM php:8-apache-buster
 
 # |--------------------------------------------------------------------------
-# | Main PHP extensions
+# | install php extensions
 # |--------------------------------------------------------------------------
-# |
-# | Installs the main PHP extensions
-# |
-
-USER root
-RUN cd /usr/local/lib/thecodingmachine-php/extensions/current/ && ./install_all.sh && ./disable_all.sh
-USER docker
+RUN docker-php-ext-install mysqli
 
 # |--------------------------------------------------------------------------
-# | Default PHP extensions to be enabled (in addition to the one declared in Slim build)
+# | enable production php ini
 # |--------------------------------------------------------------------------
-ENV PHP_EXTENSION_APCU=0 \
-    PHP_EXTENSION_MYSQLI=1 \
-    PHP_EXTENSION_PDO_MYSQL=0 \
-    PHP_EXTENSION_IGBINARY=0 \
-    PHP_EXTENSION_REDIS=0 \
-    PHP_EXTENSION_SOAP=0
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
 # |--------------------------------------------------------------------------
-# | Enable production config files
+# | copy website from node build
 # |--------------------------------------------------------------------------
-ENV APP_ENV=prod \
-    TEMPLATE_PHP_INI=production \
-    PHP_INI_ERROR_REPORTING=0
+COPY --from=build /build/public /var/www/html
 
 # |--------------------------------------------------------------------------
-# | Run Apache as www-data for more security
-# |--------------------------------------------------------------------------
-ENV APACHE_RUN_USER=www-data \
-    APACHE_RUN_GROUP=www-data \
-    APACHE_EXTENSIONS=headers
-# |--------------------------------------------------------------------------
-# | Add php files of website
+# | expose http port
 # |--------------------------------------------------------------------------
-COPY --from=build /build/public /var/www/html
\ No newline at end of file
+EXPOSE 80
-- 
GitLab