Merge branch '8.3' into develop

Author: jimyhuang

.github/workflows/docker-publish.yml

@@ -2,7 +2,7 @@ name: Create and publish a Docker image
 
 on:
   push:
-    branches: ['master','8.2','8.1','8.0','7.4','7.3','7.2','develop']
+    branches: ['master','8.3','8.2','8.1','8.0','7.4','7.3','7.2','develop']
   workflow_dispatch:
 
 jobs:
@@ -53,4 +53,3 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-

Dockerfile

@@ -34,27 +34,24 @@ WORKDIR /
 RUN \
   apt-get update && \
   apt-get install -y \
-    php8.1 \
-    php8.1-curl \
-    php8.1-imap \
-    php8.1-gd \
-    php8.1-mysql \
-    php8.1-mbstring \
-    php8.1-xml \
-    php8.1-memcached \
-    php8.1-cli \
-    php8.1-fpm \
-    php8.1-zip \
-    php8.1-bz2 \
-    php8.1-ssh2 \
-    php8.1-yaml \
-    curl \
-    vim \
-    git-core
+    php8.3 \
+    php8.3-curl \
+    php8.3-imap \
+    php8.3-gd \
+    php8.3-mysql \
+    php8.3-mbstring \
+    php8.3-xml \
+    php8.3-memcached \
+    php8.3-cli \
+    php8.3-fpm \
+    php8.3-zip \
+    php8.3-bz2 \
+    php8.3-ssh2 \
+    php8.3-yaml
 
 RUN \
   curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
-  composer global require drush/drush:8.4.12 && \
+  composer global require drush/drush && \
   cd /root/.composer && \
   find . | grep .git | xargs rm -rf && \
   composer clearcache
@@ -64,17 +61,18 @@ RUN \
 RUN \
   mkdir -p /var/www/html/log/supervisor && \
   git clone https://github.com/NETivism/docker-sh.git /home/docker && \
-  cp -f /home/docker/php/default81.ini /etc/php/8.1/docker_setup.ini && \
-  ln -s /etc/php/8.1/docker_setup.ini /etc/php/8.1/fpm/conf.d/ && \
-  cp -f /home/docker/php/default81_cli.ini /etc/php/8.1/cli/conf.d/ && \
-  cp -f /home/docker/php/default_opcache_blacklist /etc/php/8.1/opcache_blacklist && \
-  sed -i 's/^listen = .*/listen = 80/g' /etc/php/8.1/fpm/pool.d/www.conf && \
-  sed -i 's/^pm = .*/pm = ondemand/g' /etc/php/8.1/fpm/pool.d/www.conf && \
-  sed -i 's/;daemonize = .*/daemonize = no/g' /etc/php/8.1/fpm/php-fpm.conf && \
-  sed -i 's/^pm\.max_children = .*/pm.max_children = 8/g' /etc/php/8.1/fpm/pool.d/www.conf && \
-  sed -i 's/^;pm\.process_idle_timeout = .*/pm.process_idle_timeout = 15s/g' /etc/php/8.1/fpm/pool.d/www.conf && \
-  sed -i 's/^;pm\.max_requests = .*/pm.max_requests = 50/g' /etc/php/8.1/fpm/pool.d/www.conf && \
-  sed -i 's/^;request_terminate_timeout = .*/request_terminate_timeout = 7200/g' /etc/php/8.1/fpm/pool.d/www.conf
+  cp -f /home/docker/php/default83.ini /etc/php/8.3/docker_setup.ini && \
+  ln -s /etc/php/8.3/docker_setup.ini /etc/php/8.3/fpm/conf.d/ && \
+  cp -f /home/docker/php/default83_cli.ini /etc/php/8.3/cli/conf.d/ && \
+  cp -f /home/docker/php/default_opcache_blacklist /etc/php/8.3/opcache_blacklist && \
+  sed -i 's/^listen = .*/listen = 80/g' /etc/php/8.3/fpm/pool.d/www.conf && \
+  sed -i 's/^pm = .*/pm = ondemand/g' /etc/php/8.3/fpm/pool.d/www.conf && \
+  sed -i 's/;daemonize = .*/daemonize = no/g' /etc/php/8.3/fpm/php-fpm.conf && \
+  sed -i 's/^pm\.max_children = .*/pm.max_children = 8/g' /etc/php/8.3/fpm/pool.d/www.conf && \
+  sed -i 's/^;pm\.process_idle_timeout = .*/pm.process_idle_timeout = 15s/g' /etc/php/8.3/fpm/pool.d/www.conf && \
+  sed -i 's/^;pm\.max_requests = .*/pm.max_requests = 50/g' /etc/php/8.3/fpm/pool.d/www.conf && \
+  sed -i 's/^;request_terminate_timeout = .*/request_terminate_timeout = 7200/g' /etc/php/8.3/fpm/pool.d/www.conf
+
 
 COPY container/mysql/mysql-init.sh /usr/local/bin/mysql-init.sh
 COPY container/rsyslogd/rsyslog.conf /etc/rsyslog.conf
@@ -137,4 +135,3 @@ RUN \
 WORKDIR /var/www/html
 ENV TERM=xterm
 CMD ["/usr/bin/supervisord"]
-

container/supervisord/supervisord.conf

@@ -17,7 +17,7 @@ autorestart=true
 priority=10
 
 [program:php-fpm]
-command=/usr/sbin/php-fpm8.1 -c /etc/php/8.1/fpm
+command=/usr/sbin/php-fpm8.3 -c /etc/php/8.3/fpm
 autostart=true
 autorestart=true
 exitcodes=0,2,70