Skip to content

Commit a417d50

Browse files
msmith-techempowermsmith-techempower
authored
Merge pull request #9511 from joanhey/ubiquity-php8.4
[php] Ubiquity update to PHP/8.4
2 parents 8420305 + 2f74daf commit a417d50

9 files changed

+43
-43
lines changed

‎frameworks/PHP/ubiquity/ubiquity-ngx-micro.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -8,14 +8,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
88

99
RUN apt-get update -yqq > /dev/null && \
1010
apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
11-
zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
11+
zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev \
1212
php8.3-cli php8.3-dev php8.3-mbstring libphp8.3-embed nginx > /dev/null
1313

1414
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1515

16-
ADD ./ ./
16+
COPY ./ ./
1717

18-
ENV NGINX_VERSION=1.25.3
18+
ENV NGINX_VERSION=1.27.3
1919

2020
RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
2121

‎frameworks/PHP/ubiquity/ubiquity-ngx-raw.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -8,14 +8,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
88

99
RUN apt-get update -yqq > /dev/null && \
1010
apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
11-
zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
11+
zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev \
1212
php8.3-cli php8.3-dev libphp8.3-embed php8.3-pgsql nginx > /dev/null
1313

1414
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1515

16-
ADD ./ ./
16+
COPY ./ ./
1717

18-
ENV NGINX_VERSION=1.25.3
18+
ENV NGINX_VERSION=1.27.3
1919

2020
RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
2121

‎frameworks/PHP/ubiquity/ubiquity-ngx.dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:22.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

@@ -8,14 +8,14 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null
88

99
RUN apt-get update -yqq > /dev/null && \
1010
apt-get install -yqq wget git unzip libxml2-dev cmake make systemtap-sdt-dev \
11-
zlib1g-dev libpcre3-dev libargon2-0-dev libsodium-dev \
11+
zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev \
1212
php8.3-cli php8.3-dev libphp8.3-embed php8.3-pgsql nginx > /dev/null
1313

1414
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1515

16-
ADD ./ ./
16+
COPY ./ ./
1717

18-
ENV NGINX_VERSION=1.25.3
18+
ENV NGINX_VERSION=1.27.3
1919

2020
RUN git clone -b v0.0.28 --single-branch --depth 1 https://github.com/rryqszq4/ngx_php7.git > /dev/null
2121

‎frameworks/PHP/ubiquity/ubiquity-swoole-mysql.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM phpswoole/swoole:5.1.3-php8.3
1+
FROM phpswoole/swoole:php8.4
22

33
RUN docker-php-ext-install pcntl opcache > /dev/null
44

55
COPY deploy/conf/php-async.ini /usr/local/etc/php/php.ini
66

77
WORKDIR /ubiquity
8-
ADD --link . .
8+
COPY --link . .
99

1010
RUN chmod -R 777 /ubiquity
1111

‎frameworks/PHP/ubiquity/ubiquity-swoole.dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM phpswoole/swoole:5.1.3-php8.3
1+
FROM phpswoole/swoole:php8.4
22

33
RUN apt-get install -y libpq-dev \
44
&& docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
@@ -7,7 +7,7 @@ RUN apt-get install -y libpq-dev \
77
COPY deploy/conf/php-async.ini /usr/local/etc/php/php.ini
88

99
WORKDIR /ubiquity
10-
ADD --link . .
10+
COPY --link . .
1111

1212
RUN chmod -R 777 /ubiquity
1313

‎frameworks/PHP/ubiquity/ubiquity-workerman-mysql.dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq git php8.3-cli php8.3-mysql php8.3-xml php8.3-mbstring > /dev/null
8+
apt-get install -yqq git php8.4-cli php8.4-mysql php8.4-xml php8.4-mbstring > /dev/null
99

1010
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1111

12-
RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.3/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818
WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3030

3131
COPY deploy/conf/workerman/mysql/workerServices.php app/config/workerServices.php
3232

33-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.3/cli/php.ini
34-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.3/cli/php.ini
33+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/cli/php.ini
34+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.4/cli/php.ini
3535

3636
EXPOSE 8080
3737

‎frameworks/PHP/ubiquity/ubiquity-workerman-raw.dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq git php8.3-cli php8.3-pgsql php8.3-xml php8.3-mbstring > /dev/null
8+
apt-get install -yqq git php8.4-cli php8.4-pgsql php8.4-xml php8.4-mbstring > /dev/null
99

1010
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1111

12-
RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.3/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818
WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3030

3131
COPY deploy/conf/workerman/pgsql/raw/workerServices.php app/config/workerServices.php
3232

33-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.3/cli/php.ini
34-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.3/cli/php.ini
33+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.4/cli/php.ini
34+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=tracing\n" >> /etc/php/8.4/cli/php.ini
3535

3636
EXPOSE 8080
3737

‎frameworks/PHP/ubiquity/ubiquity-workerman.dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq git php8.3-cli php8.3-pgsql php8.3-xml php8.3-mbstring > /dev/null
8+
apt-get install -yqq git php8.4-cli php8.4-pgsql php8.4-xml php8.4-mbstring > /dev/null
99

1010
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1111

12-
RUN apt-get install -y php-pear php8.3-dev libevent-dev > /dev/null
13-
RUN pecl install event-3.1.3 > /dev/null && echo "extension=event.so" > /etc/php/8.3/cli/conf.d/event.ini
12+
RUN apt-get install -y php-pear php8.4-dev libevent-dev > /dev/null
13+
RUN pecl install event-3.1.4 > /dev/null && echo "extension=event.so" > /etc/php/8.4/cli/conf.d/event.ini
1414

15-
COPY deploy/conf/php-async.ini /etc/php/8.3/cli/php.ini
15+
COPY deploy/conf/php-async.ini /etc/php/8.4/cli/php.ini
1616

1717
ADD ./ /ubiquity
1818
WORKDIR /ubiquity
@@ -30,8 +30,8 @@ RUN chmod 777 -R /ubiquity/.ubiquity/*
3030

3131
COPY deploy/conf/workerman/pgsql/workerServices.php app/config/workerServices.php
3232

33-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.3/cli/php.ini
34-
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.3/cli/php.ini
33+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php\n" >> /etc/php/8.4/cli/php.ini
34+
RUN echo "opcache.jit_buffer_size=128M\nopcache.jit=function\n" >> /etc/php/8.4/cli/php.ini
3535

3636
EXPOSE 8080
3737

‎frameworks/PHP/ubiquity/ubiquity.dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44

55
RUN apt-get update -yqq && apt-get install -yqq software-properties-common > /dev/null
66
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
77
RUN apt-get update -yqq > /dev/null && \
8-
apt-get install -yqq nginx git unzip php8.3 php8.3-common php8.3-cli php8.3-fpm php8.3-mysql php8.3-dev > /dev/null
8+
apt-get install -yqq nginx git unzip php8.4 php8.4-common php8.4-cli php8.4-fpm php8.4-mysql php8.4-dev > /dev/null
99

1010
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
1111

12-
COPY deploy/conf/* /etc/php/8.3/fpm/
12+
COPY deploy/conf/* /etc/php/8.4/fpm/
1313

1414
ADD ./ /ubiquity
1515
WORKDIR /ubiquity
1616

17-
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.3/fpm/php-fpm.conf ; fi;
17+
RUN if [ $(nproc) = 2 ]; then sed -i "s|pm.max_children = 1024|pm.max_children = 512|g" /etc/php/8.4/fpm/php-fpm.conf ; fi;
1818

1919
RUN composer install --optimize-autoloader --classmap-authoritative --no-dev --quiet
2020

2121
RUN chmod 777 -R /ubiquity/app/cache/*
2222

2323
COPY deploy/conf/ubiquity-config.php app/config/config.php
2424

25-
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.3/fpm/php.ini
25+
RUN echo "opcache.preload=/ubiquity/app/config/preloader.script.php" >> /etc/php/8.4/fpm/php.ini
2626

2727
EXPOSE 8080
2828

29-
CMD service php8.3-fpm start && \
29+
CMD service php8.4-fpm start && \
3030
nginx -c /ubiquity/deploy/nginx.conf -g "daemon off;"

0 commit comments

Comments
 (0)