Skip to content

Commit

Permalink
refs #41568, add 8.3 based php container
Browse files Browse the repository at this point in the history
  • Loading branch information
jimyhuang committed Sep 30, 2024
1 parent 0fb0efb commit 422cee8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -52,4 +52,4 @@ jobs:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
52 changes: 26 additions & 26 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,24 @@ WORKDIR /
RUN \
apt-get update && \
apt-get install -y \
php8.2 \
php8.2-curl \
php8.2-imap \
php8.2-gd \
php8.2-mysql \
php8.2-mbstring \
php8.2-xml \
php8.2-memcached \
php8.2-cli \
php8.2-fpm \
php8.2-zip \
php8.2-bz2 \
php8.2-ssh2 \
php8.2-yaml
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 \docker-debian-php
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
Expand All @@ -61,17 +61,17 @@ 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/default82.ini /etc/php/8.2/docker_setup.ini && \
ln -s /etc/php/8.2/docker_setup.ini /etc/php/8.2/fpm/conf.d/ && \
cp -f /home/docker/php/default82_cli.ini /etc/php/8.2/cli/conf.d/ && \
cp -f /home/docker/php/default_opcache_blacklist /etc/php/8.2/opcache_blacklist && \
sed -i 's/^listen = .*/listen = 80/g' /etc/php/8.2/fpm/pool.d/www.conf && \
sed -i 's/^pm = .*/pm = ondemand/g' /etc/php/8.2/fpm/pool.d/www.conf && \
sed -i 's/;daemonize = .*/daemonize = no/g' /etc/php/8.2/fpm/php-fpm.conf && \
sed -i 's/^pm\.max_children = .*/pm.max_children = 8/g' /etc/php/8.2/fpm/pool.d/www.conf && \
sed -i 's/^;pm\.process_idle_timeout = .*/pm.process_idle_timeout = 15s/g' /etc/php/8.2/fpm/pool.d/www.conf && \
sed -i 's/^;pm\.max_requests = .*/pm.max_requests = 50/g' /etc/php/8.2/fpm/pool.d/www.conf && \
sed -i 's/^;request_terminate_timeout = .*/request_terminate_timeout = 7200/g' /etc/php/8.2/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
Expand Down

0 comments on commit 422cee8

Please sign in to comment.