PHP 8.3 install mysql module

.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:

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

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 \

docker/init

@@ -31,6 +31,17 @@ function nginx_start() {
 	fi
 }
 
+function wait_for_db() {
+	# Wait for DB to be active
+	if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
+		while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
+			echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
+			sleep 1;
+		done
+		echo "- DB is active on ${DB_HOST}:${DB_PORT}"
+	fi
+}
+
 # Run any container setup
 [ -x /sbin/init-container ] && /sbin/init-container
 
@@ -41,12 +52,7 @@ if [ -x /usr/bin/memcached -a "${MEMCACHED_START}" == "TRUE" ]; then
 fi
 
 # Laravel Specific
-if [ "${role}" = "app" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
+if [ -r artisan -a -e ${php}/.env ]; then
 	mp=$(mp ${php})
 
 	# Only adjust perms if this is an external mountpoint
@@ -66,138 +72,108 @@ if [ "${role}" = "app" -a -e artisan ]; then
 		fi
 	fi
 
-	if [ "${env}" != "local" -a -r "artisan" ]; then
-		# See if we need to refresh our dependancies
-		if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
-			echo "* Composer installing dependancies..."
+	# See if we need to refresh our dependancies
+	if [[ -r composer.json && ( -e .composer.refresh || ! -d vendor ) ]]; then
+		echo "* Composer installing dependancies..."
 
-			rm -f ${php}/bootstrap/cache/*.php
-			if [ "${env}" != "local" ]; then
-				NODEV="--no-dev"
-			fi
-
-			mp=$(mp ${composer})
-
-			if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
-				[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}
-				[ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor
-				[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chmod g+w ${php}
-			fi
-
-			su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh )
-			[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php}
+		rm -f ${php}/bootstrap/cache/*.php
+		if [ "${env}" != "local" ]; then
+			NODEV="--no-dev"
 		fi
 
-		if [ -e .lumen ]; then
-			echo "* Lumen detected..."
-		else
+		mp=$(mp ${composer})
+
+		if [ ${mp} -eq 0 -o -n "${FORCE_PERMS}" ] ; then
+			[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chown -R www-data:www-data ${composer}
+			[ ! -d ${php}/vendor ] && mkdir -m 750 ${php}/vendor && chown www-data:www-data ${php}/vendor
+			[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && chmod g+w ${php}
+		fi
+
+		su www-data -s /bin/sh -c "composer install --optimize-autoloader ${NODEV}" && ( test -e .composer.refresh && rm -f .composer.refresh )
+		[ -n "${FORCE_PERMS}" -o "${env}" != "local" -a -z "${SKIP_PERM}" ] && [ ${mp} -eq 0 ] && chmod g-w ${php}
+	fi
+
+	if [ -e .lumen ]; then
+		echo "* Lumen detected, not caching configuration..."
+	else
+		# We only check for non mount points, in case this container has the app inside
+		mp=$(mp ${php})
+		if [ ${mp} -eq 1 ]; then
 			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan optimize && php artisan view:cache)"
-		fi
-
-		if [ -z "${IGNORE_MIGRATION}" ]; then
-			if [ -r .migrate ]; then
-				echo "* Running migration..."
-				# If DB_HOST not set, source the env file
-				[ -z "${DB_HOST}" -a -r .env ] && . .env
-
-				if [ -n "${DB_HOST}" -a -n "${DB_PORT}" ]; then
-					while ! wait-for-it -h ${DB_HOST} -p ${DB_PORT} -t 5 -q; do
-						echo "? Waiting for database at ${DB_HOST}:${DB_PORT}"
-						sleep 1;
-					done
-					echo "- DB is active on ${DB_HOST}:${DB_PORT}"
-				fi
-
-				su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
-			fi
-		else
-			[ -r .migrate ] && echo "! NOTE: Migration ignored due to IGNORE_MIGRATION"
-		fi
-
-		# If passport is installed
-		if [ -d ${php}/vendor/laravel/passport ]; then
-			echo "* Generating OAUTH keys ..."
-			set +e
-			su www-data -s /bin/sh -c "php artisan passport:keys"
-			set -e
+			su www-data -s /bin/sh -c "(php artisan optimize)"
 		fi
 	fi
 
-	nginx_start
+	if [ "${role}" = "app" ]; then
+		if [ "${env}" != "local" ]; then
+			if [ -z "${IGNORE_MIGRATION}" ]; then
+				if [ -r .migrate ]; then
+					echo "* Running migration..."
+					# If DB_HOST not set, source the env file
+					[ -z "${DB_HOST}" -a -r .env ] && . .env
+
+					wait_for_db
+
+					su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
+				fi
+			else
+				[ -r .migrate ] && echo "! NOTE: Migration ignored due to IGNORE_MIGRATION"
+			fi
+
+			# If passport is installed
+			if [ -d ${php}/vendor/laravel/passport ]; then
+				echo "* Generating OAUTH keys ..."
+				set +e
+				su www-data -s /bin/sh -c "php artisan passport:keys"
+				set -e
+			fi
+		fi
+
+		nginx_start
+
+		if [ "${LOCAL_QUEUE}" = "TRUE" ]; then
+			echo "* Starting local queue for [$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}}] with job timeout of [${WORK_TIMEOUT:-90}], trying [${WORK_TRIES:-1}] times..."
+			su www-data -s /bin/sh -c "
+				(while true; do php ${PHP_OPTIONS} artisan queue:work --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} --queue=$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}; done) &
+			"
+		fi
+
+		set +e
+		[ -x init-php.sh ] && su www-data -s /bin/bash "init-php.sh" &
+
+		exec /usr/local/bin/docker-php-entrypoint "$@"
+
+	elif [ "$role" = "queue" ]; then
+		QUEUE_CMD=work
+
+		if [ "${env}" == "local" ]; then
+			QUEUE_CMD=listen
+		fi
+
+		echo "* Running the queue..."
+		# We'll delay starting in case the app is caching
+		sleep 15
+
+		wait_for_db
 
-	if [ "${LOCAL_QUEUE}" = "TRUE" ]; then
-		echo "* Starting local queue for [$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}}] with job timeout of [${WORK_TIMEOUT:-90}], trying [${WORK_TRIES:-1}] times..."
 		su www-data -s /bin/sh -c "
-		(while true; do php ${PHP_OPTIONS} artisan queue:work --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} --queue=$(hostname)${LOCAL_QUEUES:+,${LOCAL_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}; done) &
+		while true; do
+			php ${PHP_OPTIONS} artisan queue:${QUEUE_CMD} --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} ${WORK_QUEUES:+--queue=${WORK_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}
+		done
+		"
+
+	elif [ "$role" = "scheduler" ]; then
+		echo "* Running the scheduler..."
+		# We'll delay starting in case the app is caching
+		sleep 15
+
+		su www-data -s /bin/sh -c "
+		while true; do
+			php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction
+		done
 		"
 	fi
 
-	set +e
-	[ -x init-php.sh ] && su www-data -s /bin/bash "init-php.sh" &
-
-	exec /usr/local/bin/docker-php-entrypoint "$@"
-
-elif [ "$role" = "queue" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
-	QUEUE_CMD=work
-	if [ "${env}" == "local" ]; then
-		QUEUE_CMD=listen
-	fi
-
-	if [ -e .lumen ]; then
-		echo "* Lumen detected..."
-	else
-		# We only check for non mount points, in case this container has the app inside
-		mp=$(mp ${php})
-		if [ ${mp} -eq 1 ]; then
-			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
-		fi
-	fi
-
-	echo "* Running the queue..."
-	# We'll delay starting in case the app is caching
-	sleep 15
-
-	su www-data -s /bin/sh -c "
-	while true; do
-		php ${PHP_OPTIONS} artisan queue:${QUEUE_CMD} --verbose --tries=${WORK_TRIES:-1} --timeout=${WORK_TIMEOUT:-90} ${WORK_QUEUES:+--queue=${WORK_QUEUES}} ${WORK_MEMORY:+--memory=${WORK_MEMORY}} ${WORK_ONCE:+--once}
-	done
-	"
-
-elif [ "$role" = "scheduler" -a -e artisan ]; then
-	if [ ! -e ${php}/.env ]; then
-		echo "! ERROR: NO .env file..."
-		exec /bin/bash
-	fi
-
-	if [ -e .lumen ]; then
-		echo "* Lumen detected..."
-	else
-		# We only check for non mount points, in case this container has the app inside
-		mp=$(mp ${php})
-		if [ ${mp} -eq 1 ]; then
-			echo "* Caching configuration..."
-			su www-data -s /bin/sh -c "(php artisan config:cache && php artisan route:cache && php artisan view:cache)"
-		fi
-	fi
-
-	echo "* Running the scheduler..."
-	# We'll delay starting in case the app is caching
-	sleep 15
-
-	su www-data -s /bin/sh -c "
-	while true; do
-		(php ${PHP_OPTIONS} artisan schedule:run --verbose --no-interaction &)
-		sleep 60
-	done
-	"
-
 else
 	nginx_start