Skip to content

Commit

Permalink
feat: CP 2.2.0 + Alpine 3.20 + PHP 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
marverix committed Nov 15, 2024
1 parent 6c8f1d8 commit 5b403b7
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 23 deletions.
10 changes: 8 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
# Changelog

## 1.7.3-rc1
## 2.2.0-r1

* Updated to ClassicPress 2.2.0
* Alpine updated to 3.20
* PHP updated to 8.2

## 1.7.3-r1

* Updated to ClassicPress 1.7.3

## 1.7.1-rc1
## 1.7.1-r1

* **BREAKING CHANGES**:

Expand Down
40 changes: 20 additions & 20 deletions classicpress/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM alpine:3.16
FROM alpine:3.20

LABEL Maintainer="Marek Sierociński"
LABEL Description="ClassicPress image based on trafex/php-nginx"

# Version of ClassicPress
ARG version=1.7.3
ARG version=2.2.0
# ARG corerules_version=3.3.4
ARG www_dir=/var/www/html

Expand All @@ -29,22 +29,22 @@ RUN apk update \
bash \
curl \
nginx \
php8 \
php8-ctype \
php8-curl \
php8-dom \
php8-fpm \
php8-gd \
php8-intl \
php8-mbstring \
php8-mysqli \
php8-opcache \
php8-openssl \
php8-phar \
php8-session \
php8-xml \
php8-xmlreader \
php8-zlib \
php82 \
php82-ctype \
php82-curl \
php82-dom \
php82-fpm \
php82-gd \
php82-intl \
php82-mbstring \
php82-mysqli \
php82-opcache \
php82-openssl \
php82-phar \
php82-session \
php82-xml \
php82-xmlreader \
php82-zlib \
supervisor

COPY ./ ${WORKDIR_FILES}/
Expand All @@ -55,8 +55,8 @@ RUN adduser -D -u 2048 press \
&& addgroup press nginx

# Configure services
RUN cp ${WORKDIR_FILES}/conf/php.ini /etc/php8/conf.d/custom.ini \
&& cp ${WORKDIR_FILES}/conf/fpm-pool.conf /etc/php8/php-fpm.d/www.conf \
RUN cp ${WORKDIR_FILES}/conf/php.ini /etc/php82/conf.d/custom.ini \
&& cp ${WORKDIR_FILES}/conf/fpm-pool.conf /etc/php82/php-fpm.d/www.conf \
&& cp ${WORKDIR_FILES}/conf/nginx.conf /etc/nginx/nginx.conf \
&& cp ${WORKDIR_FILES}/conf/supervisord.conf /etc/supervisord.conf \
&& rm -rf ${www_dir}/*
Expand Down
2 changes: 1 addition & 1 deletion classicpress/conf/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ logfile_maxbytes=0
pidfile=/run/supervisord.pid

[program:php-fpm]
command=php-fpm8 -F
command=php-fpm82 -F
stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr
Expand Down

0 comments on commit 5b403b7

Please sign in to comment.