Skip to content

Commit

Permalink
Start EL9 PHP 8.2
Browse files Browse the repository at this point in the history
Part of request #30344: Run Tuleap with PHP 8.2
  • Loading branch information
LeSuisse committed Jan 8, 2024
1 parent eafdc28 commit 3a892b8
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Build_And_Publish_Docker_Images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Build and publish Docker images
on:
push:
branches:
- el9-php81
- el9-php82
workflow_dispatch:

permissions:
Expand Down
48 changes: 24 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rockylinux@sha256:99376f245b2d13d273260654d3b769918aa8af29b04f771add8ea0c9bf40a66c
FROM rockylinux@sha256:45cc42828cc5ceeffa3a9b4f6363fb582fac3ab91f77bf403daa067f8f049f96

ENV container docker

Expand Down Expand Up @@ -37,37 +37,37 @@ RUN rm -f /lib/systemd/system/multi-user.target.wants/*;\
openldap-clients \
vim \
less \
php81-php-intl \
php81-php-bcmath \
php81-php-gd \
php81-php-soap \
php81-php-mysqlnd \
php81-php-xml \
php81-php-mbstring \
php81-php-cli \
php81-php-opcache \
php81-php-process \
php81-php-pdo \
php81-php-fpm \
php81-php-ldap \
php81-php-sodium \
php81-php-pecl-xdebug \
php81-php-intl \
php81-php-bcmath \
php81-php-ffi \
php81-php-pecl-zip \
php81-php-pecl-mailparse \
php81-php-pecl-redis5 && \
php82-php-intl \
php82-php-bcmath \
php82-php-gd \
php82-php-soap \
php82-php-mysqlnd \
php82-php-xml \
php82-php-mbstring \
php82-php-cli \
php82-php-opcache \
php82-php-process \
php82-php-pdo \
php82-php-fpm \
php82-php-ldap \
php82-php-sodium \
php82-php-pecl-xdebug \
php82-php-intl \
php82-php-bcmath \
php82-php-ffi \
php82-php-pecl-zip \
php82-php-pecl-mailparse \
php82-php-pecl-redis5 && \
dnf clean all && \
rm -rf /usr/share/tuleap && \
sed -i 's/inet_interfaces = localhost/inet_interfaces = all/' /etc/postfix/main.cf && \
localedef -i fr_FR -c -f UTF-8 fr_FR.UTF-8 && \
localedef -i pt_BR -c -f UTF-8 pt_BR.UTF-8

COPY xdebug-fpm.ini /etc/opt/remi/php81/php.d/15-xdebug.ini
COPY xdebug-fpm.ini /etc/opt/remi/php82/php.d/15-xdebug.ini

## Run environment
ENV PHP_VERSION php81
ENV PHP_VERSION php82
WORKDIR /usr/share/tuleap
VOLUME [ "/data", "/usr/share/tuleap" ]
EXPOSE 22 80 443
Expand Down
8 changes: 4 additions & 4 deletions tuleap-php-fpm-override.conf
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[Unit]
Conflicts=php80-php-fpm.service php81-php-fpm.service
Conflicts=php81-php-fpm.service php82-php-fpm.service

[Service]
PIDFile=/var/opt/remi/php81/run/php-fpm/php-fpm.pid
EnvironmentFile=/etc/opt/remi/php81/sysconfig/php-fpm
PIDFile=/var/opt/remi/php82/run/php-fpm/php-fpm.pid
EnvironmentFile=/etc/opt/remi/php82/sysconfig/php-fpm
ExecStart=
ExecStart=/opt/remi/php81/root/usr/sbin/php-fpm --nodaemonize
ExecStart=/opt/remi/php82/root/usr/sbin/php-fpm --nodaemonize

0 comments on commit 3a892b8

Please sign in to comment.