Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[php] Ngx-php update to PHP/8.4 #9524

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions frameworks/PHP/php-ngx/php-ngx-mysql.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
RUN apt-get update -yqq > /dev/null && \
apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev libkrb5-dev \
php8.3-cli php8.3-dev libphp8.3-embed php8.3-mysql > /dev/null
php8.4-cli php8.4-dev libphp8.4-embed php8.4-mysql > /dev/null

ENV NGINX_VERSION 1.26.0
ENV NGINX_VERSION 1.27.3

RUN git clone -b v0.0.29 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
RUN git clone -b v0.0.30 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null

RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
Expand All @@ -27,7 +27,7 @@ RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
--add-module=/ngx-php > /dev/null && \
make > /dev/null && make install > /dev/null

RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.3/embed/conf.d/10-opcache.ini
RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.4/embed/conf.d/10-opcache.ini

COPY --link . .

Expand All @@ -36,4 +36,4 @@ RUN export WORKERS=$(( 4 * $(nproc) )) && \

EXPOSE 8080

CMD /nginx/sbin/nginx -c /deploy/nginx.conf
CMD /nginx/sbin/nginx -c /deploy/nginx.conf
8 changes: 4 additions & 4 deletions frameworks/PHP/php-ngx/php-ngx-pgsql.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
RUN apt-get update -yqq > /dev/null && \
apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev libkrb5-dev \
php8.3-cli php8.3-dev libphp8.3-embed php8.3-pgsql > /dev/null
php8.4-cli php8.4-dev libphp8.4-embed php8.4-pgsql > /dev/null

ENV NGINX_VERSION 1.26.0
ENV NGINX_VERSION 1.27.3

RUN git clone -b v0.0.29 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
RUN git clone -b v0.0.30 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null

RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
Expand All @@ -27,7 +27,7 @@ RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
--add-module=/ngx-php > /dev/null && \
make > /dev/null && make install > /dev/null

RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.3/embed/conf.d/10-opcache.ini
RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.4/embed/conf.d/10-opcache.ini

COPY --link . .

Expand Down
12 changes: 6 additions & 6 deletions frameworks/PHP/php-ngx/php-ngx.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php > /dev/null && \
RUN apt-get update -yqq > /dev/null && \
apt-get install -yqq wget git libxml2-dev systemtap-sdt-dev \
zlib1g-dev libpcre3-dev libargon2-dev libsodium-dev libkrb5-dev \
php8.3-cli php8.3-dev libphp8.3-embed php8.3-mysql > /dev/null
php8.4-cli php8.4-dev libphp8.4-embed php8.4-mysql > /dev/null

ENV NGINX_VERSION 1.26.0
ENV NGINX_VERSION 1.27.3

RUN git clone -b v0.0.29 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null
RUN git clone -b v0.0.30 --single-branch --depth 1 https://github.com/rryqszq4/ngx-php.git > /dev/null

RUN wget -q http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
tar -zxf nginx-${NGINX_VERSION}.tar.gz && \
cd nginx-${NGINX_VERSION} && \
export PHP_LIB=/usr/lib && \
export PHP_LIB=/usr/lib && \
./configure --user=www --group=www \
--prefix=/nginx \
--with-ld-opt="-Wl,-rpath,$PHP_LIB" \
--add-module=/ngx-php/third_party/ngx_devel_kit \
--add-module=/ngx-php > /dev/null && \
make > /dev/null && make install > /dev/null

RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.3/embed/conf.d/10-opcache.ini
RUN sed -i "s|opcache.jit=off|;opcache.jit=off|g" /etc/php/8.4/embed/conf.d/10-opcache.ini

COPY --link . .

EXPOSE 8080

CMD /nginx/sbin/nginx -c /deploy/nginx_default.conf
CMD /nginx/sbin/nginx -c /deploy/nginx_default.conf
Loading