Skip to content

Commit 422cee8

Browse files
committed
refs #41568, add 8.3 based php container
1 parent 0fb0efb commit 422cee8

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

.github/workflows/docker-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Create and publish a Docker image
22

33
on:
44
push:
5-
branches: ['master','8.2','8.1','8.0','7.4','7.3','7.2','develop']
5+
branches: ['master','8.3','8.2','8.1','8.0','7.4','7.3','7.2','develop']
66
workflow_dispatch:
77

88
jobs:
@@ -52,4 +52,4 @@ jobs:
5252
context: .
5353
push: true
5454
tags: ${{ steps.meta.outputs.tags }}
55-
labels: ${{ steps.meta.outputs.labels }}
55+
labels: ${{ steps.meta.outputs.labels }}

Dockerfile

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ WORKDIR /
3434
RUN \
3535
apt-get update && \
3636
apt-get install -y \
37-
php8.2 \
38-
php8.2-curl \
39-
php8.2-imap \
40-
php8.2-gd \
41-
php8.2-mysql \
42-
php8.2-mbstring \
43-
php8.2-xml \
44-
php8.2-memcached \
45-
php8.2-cli \
46-
php8.2-fpm \
47-
php8.2-zip \
48-
php8.2-bz2 \
49-
php8.2-ssh2 \
50-
php8.2-yaml
37+
php8.3 \
38+
php8.3-curl \
39+
php8.3-imap \
40+
php8.3-gd \
41+
php8.3-mysql \
42+
php8.3-mbstring \
43+
php8.3-xml \
44+
php8.3-memcached \
45+
php8.3-cli \
46+
php8.3-fpm \
47+
php8.3-zip \
48+
php8.3-bz2 \docker-debian-php
49+
php8.3-ssh2 \
50+
php8.3-yaml
5151

5252
RUN \
5353
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
54-
composer global require drush/drush:8.4.12 && \
54+
composer global require drush/drush && \
5555
cd /root/.composer && \
5656
find . | grep .git | xargs rm -rf && \
5757
composer clearcache
@@ -61,17 +61,17 @@ RUN \
6161
RUN \
6262
mkdir -p /var/www/html/log/supervisor && \
6363
git clone https://github.com/NETivism/docker-sh.git /home/docker && \
64-
cp -f /home/docker/php/default82.ini /etc/php/8.2/docker_setup.ini && \
65-
ln -s /etc/php/8.2/docker_setup.ini /etc/php/8.2/fpm/conf.d/ && \
66-
cp -f /home/docker/php/default82_cli.ini /etc/php/8.2/cli/conf.d/ && \
67-
cp -f /home/docker/php/default_opcache_blacklist /etc/php/8.2/opcache_blacklist && \
68-
sed -i 's/^listen = .*/listen = 80/g' /etc/php/8.2/fpm/pool.d/www.conf && \
69-
sed -i 's/^pm = .*/pm = ondemand/g' /etc/php/8.2/fpm/pool.d/www.conf && \
70-
sed -i 's/;daemonize = .*/daemonize = no/g' /etc/php/8.2/fpm/php-fpm.conf && \
71-
sed -i 's/^pm\.max_children = .*/pm.max_children = 8/g' /etc/php/8.2/fpm/pool.d/www.conf && \
72-
sed -i 's/^;pm\.process_idle_timeout = .*/pm.process_idle_timeout = 15s/g' /etc/php/8.2/fpm/pool.d/www.conf && \
73-
sed -i 's/^;pm\.max_requests = .*/pm.max_requests = 50/g' /etc/php/8.2/fpm/pool.d/www.conf && \
74-
sed -i 's/^;request_terminate_timeout = .*/request_terminate_timeout = 7200/g' /etc/php/8.2/fpm/pool.d/www.conf
64+
cp -f /home/docker/php/default83.ini /etc/php/8.3/docker_setup.ini && \
65+
ln -s /etc/php/8.3/docker_setup.ini /etc/php/8.3/fpm/conf.d/ && \
66+
cp -f /home/docker/php/default83_cli.ini /etc/php/8.3/cli/conf.d/ && \
67+
cp -f /home/docker/php/default_opcache_blacklist /etc/php/8.3/opcache_blacklist && \
68+
sed -i 's/^listen = .*/listen = 80/g' /etc/php/8.3/fpm/pool.d/www.conf && \
69+
sed -i 's/^pm = .*/pm = ondemand/g' /etc/php/8.3/fpm/pool.d/www.conf && \
70+
sed -i 's/;daemonize = .*/daemonize = no/g' /etc/php/8.3/fpm/php-fpm.conf && \
71+
sed -i 's/^pm\.max_children = .*/pm.max_children = 8/g' /etc/php/8.3/fpm/pool.d/www.conf && \
72+
sed -i 's/^;pm\.process_idle_timeout = .*/pm.process_idle_timeout = 15s/g' /etc/php/8.3/fpm/pool.d/www.conf && \
73+
sed -i 's/^;pm\.max_requests = .*/pm.max_requests = 50/g' /etc/php/8.3/fpm/pool.d/www.conf && \
74+
sed -i 's/^;request_terminate_timeout = .*/request_terminate_timeout = 7200/g' /etc/php/8.3/fpm/pool.d/www.conf
7575

7676

7777
COPY container/mysql/mysql-init.sh /usr/local/bin/mysql-init.sh

0 commit comments

Comments
 (0)