Add imagick and gmp modules

.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-pgsql-image
   DOCKER_HOST: tcp://127.0.0.1:2375
 
 jobs:

docker/Dockerfile

@@ -1,61 +1,11 @@
 # NAME docker/php
-# VERSION 8.3-fpm-alpine
+# VERSION 8.3-fpm-pgsql-image
 
-FROM php:8.3-fpm-alpine
+FROM gitea.dege.au/docker/php:8.3-fpm-pgsql
 
-# 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
-
-# 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" ]
+# Images
+RUN apk add --no-cache imagemagick libheif libde265 php83-pecl-imagick \
+	&& ln /usr/lib/php83/modules/imagick.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ \
+	&& ln /etc/php83/conf.d/imagick.ini /usr/local/etc/php/conf.d/
+RUN apk add --no-cache gmp-dev \
+	&& docker-php-ext-install -j$(nproc) gmp

docker/Dockerfile.phptest

@@ -1,7 +1,7 @@
 # NAME docker/php
-# VERSION 8.3-fpm-test
+# VERSION 8.3-fpm-pgsql-test
 
-FROM gitea.dege.au/docker/php:8.3-fpm
+FROM gitea.dege.au/docker/php:8.3-fpm-pgsql
 
 # 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
 
@@ -101,13 +112,7 @@ if [ -r artisan -a -e ${php}/.env ]; then
 					# 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
+					wait_for_db
 
 					su www-data -s /bin/sh -c "php artisan migrate" && rm -f .migrate
 				fi
@@ -149,6 +154,8 @@ if [ -r artisan -a -e ${php}/.env ]; then
 		# We'll delay starting in case the app is caching
 		sleep 15
 
+		wait_for_db
+
 		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}
@@ -162,7 +169,7 @@ if [ -r artisan -a -e ${php}/.env ]; then
 
 		su www-data -s /bin/sh -c "
 		while true; do
-			(php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction &)
+			php ${PHP_OPTIONS} artisan schedule:work --verbose --no-interaction
 		done
 		"
 	fi