From 4631514798a99c2da99f6c792c2c33ae402427a6 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 3 Feb 2023 21:51:53 +1100
Subject: [PATCH] PHP 8.3 install mysql module

---
 .gitea/workflows/build_docker.yaml |  2 +-
 docker/Dockerfile                  | 60 ++----------------------------
 docker/Dockerfile.phptest          |  4 +-
 3 files changed, 7 insertions(+), 59 deletions(-)

diff --git a/.gitea/workflows/build_docker.yaml b/.gitea/workflows/build_docker.yaml
index 2d73c58..2de87e7 100644
--- a/.gitea/workflows/build_docker.yaml
+++ b/.gitea/workflows/build_docker.yaml
@@ -2,7 +2,7 @@ name: Create Docker Image
 run-name: ${{ gitea.actor }} Building Docker Image 🐳
 on: [push]
 env:
-  VERSION: 8.3-fpm
+  VERSION: 8.3-fpm-mysql
   DOCKER_HOST: tcp://127.0.0.1:2375
 
 jobs:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2fe22f1..481a7e9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,61 +1,9 @@
 # NAME docker/php
 # VERSION 8.3-fpm-alpine
 
-FROM php:8.3-fpm-alpine
+FROM gitea.dege.au/docker/php:8.3-fpm
 
-# Change to http respositories, so they we can cache the install packages
-RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi
-COPY docker/pecl_install /usr/local/bin/pecl_install
+RUN apk add --no-cache mysql-client && \
+	docker-php-ext-install -j$(nproc) pdo_mysql mysqli
 
-# Tune PHP
-RUN sed -e 's/^expose_php = On/expose_php = Off/' /usr/local/etc/php/php.ini-production > /usr/local/etc/php/php.ini
-RUN sed -i -e 's#^;sendmail_path =#sendmail_path = "/usr/bin/msmtp -t"#' /usr/local/etc/php/php.ini
-RUN sed -i -e 's#^memory_limit = 128M#memory_limit = 256M#' /usr/local/etc/php/php.ini
-RUN adduser -g "Hosting Admin User" -u 1000 -G www-data -h /var/www/html -HD lamp
-
-# Base
-RUN apk add --no-cache bash unzip zlib nginx msmtp
-RUN curl -SLo /usr/local/bin/wait-for-it https://github.com/vishnubob/wait-for-it/raw/master/wait-for-it.sh && chmod +x /usr/local/bin/wait-for-it
-
-# Memcache
-RUN apk add --no-cache memcached libmemcached pkgconfig zlib-dev memcached-dev libmemcached-dev && \
-	pecl_install igbinary msgpack memcached && \
-	mkdir /run/memcached && chown memcached:memcached /run/memcached && \
-	apk del --no-cache pkgconfig zlib-dev memcached-dev libmemcached-dev
-
-# Enable ZIP BZIP2
-RUN apk add --no-cache libzip libzip-dev zlib-dev && \
-	docker-php-ext-install -j$(nproc) zip bz2 && \
-	apk del --no-cache libzip-dev zlib-dev
-
-# Add zstd
-RUN pecl_install zstd
-
-# Add GD
-RUN apk add --no-cache libjpeg libgd libpng freetype freetype-dev zlib-dev libpng-dev jpeg-dev && \
-	docker-php-ext-configure gd --with-freetype=/usr/include/freetype2 --with-jpeg=/usr/include/ && \
-	docker-php-ext-install -j$(nproc) gd && \
-	apk del --no-cache zlib-dev libpng-dev jpeg-dev freetype-dev
-
-# Add intl
-RUN apk add --no-cache icu icu-dev && \
-	docker-php-ext-install -j$(nproc) intl && \
-	apk del --no-cache icu-dev
-
-# Add composer
-RUN curl -4 https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer
-ENV COMPOSER_HOME=/var/cache/composer
-
-# Other config
-COPY msmtprc /etc/
-COPY docker/www.conf /usr/local/etc/php-fpm.d/
-COPY docker/nginx-app.conf /etc/nginx/http.d/default.conf
-
-COPY docker/init /sbin/
-RUN chmod 550 /sbin/init && chown 0:0 /sbin/init
-
-VOLUME [ "/var/cache/composer" ]
-WORKDIR /var/www/html
-EXPOSE 80
-ENTRYPOINT [ "/sbin/init" ]
-CMD [ "php-fpm" ]
+RUN apk add --no-cache npm mysql-client
diff --git a/docker/Dockerfile.phptest b/docker/Dockerfile.phptest
index 832e640..2d79784 100644
--- a/docker/Dockerfile.phptest
+++ b/docker/Dockerfile.phptest
@@ -1,7 +1,7 @@
 # NAME docker/php
-# VERSION 8.3-fpm-test
+# VERSION 8.3-fpm-mysql-test
 
-FROM gitea.dege.au/docker/php:8.3-fpm
+FROM gitea.dege.au/docker/php:8.3-fpm-mysql
 
 # Add xdebug
 RUN apk --no-cache add linux-headers \