Skip to content

Commit 8d03bdb

Browse files
authored
PHP 8.5 (#21)
1 parent 1a8440b commit 8d03bdb

File tree

8 files changed

+205
-5
lines changed

8 files changed

+205
-5
lines changed

.github/workflows/docker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ jobs:
4343
- item: "8.3-fpm"
4444
- item: "8.4"
4545
- item: "8.4-fpm"
46+
- item: "8.5"
47+
- item: "8.5-fpm"
4648

4749
fail-fast: false

8.5-fpm/Dockerfile

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
FROM dockette/debian:bullseye
2+
3+
LABEL maintainer="[email protected]"
4+
5+
# PHP
6+
ENV PHP_MODS_DIR=/etc/php/8.5/mods-available
7+
ENV PHP_CLI_DIR=/etc/php/8.5/cli
8+
ENV PHP_CLI_CONF_DIR=${PHP_CLI_DIR}/conf.d
9+
ENV PHP_CGI_DIR=/etc/php/8.5/cgi
10+
ENV PHP_CGI_CONF_DIR=${PHP_CGI_DIR}/conf.d
11+
ENV PHP_FPM_DIR=/etc/php/8.5/fpm
12+
ENV PHP_FPM_CONF_DIR=${PHP_FPM_DIR}/conf.d
13+
ENV PHP_FPM_POOL_DIR=${PHP_FPM_DIR}/pool.d
14+
ENV TZ=Europe/Prague
15+
16+
# INSTALLATION
17+
RUN apt update && apt dist-upgrade -y && \
18+
# DEPENDENCIES #############################################################
19+
apt install -y wget curl apt-transport-https ca-certificates lsb-release git unzip && \
20+
# PHP DEB.SURY.CZ ##########################################################
21+
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
22+
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \
23+
apt update && \
24+
apt dist-upgrade -y && \
25+
apt install -y --no-install-recommends \
26+
php8.5-apcu \
27+
php8.5-bz2 \
28+
php8.5-bcmath \
29+
php8.5-calendar \
30+
php8.5-cgi \
31+
php8.5-cli \
32+
php8.5-ctype \
33+
php8.5-curl \
34+
php8.5-fpm \
35+
php8.5-gettext \
36+
php8.5-gd \
37+
php8.5-intl \
38+
php8.5-imap \
39+
php8.5-ldap \
40+
php8.5-mbstring \
41+
php8.5-memcached \
42+
php8.5-mysql \
43+
php8.5-pdo \
44+
php8.5-pgsql \
45+
php8.5-soap \
46+
php8.5-sqlite3 \
47+
php8.5-zip \
48+
php8.5-xmlrpc \
49+
php8.5-xsl && \
50+
# COMPOSER #################################################################
51+
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --2 && \
52+
# PHP MOD(s) ###############################################################
53+
ln -s ${PHP_MODS_DIR}/custom.ini ${PHP_CLI_CONF_DIR}/999-custom.ini && \
54+
ln -s ${PHP_MODS_DIR}/custom.ini ${PHP_CGI_CONF_DIR}/999-custom.ini && \
55+
ln -s ${PHP_MODS_DIR}/custom.ini ${PHP_FPM_CONF_DIR}/999-custom.ini && \
56+
# CLEAN UP #################################################################
57+
rm ${PHP_FPM_POOL_DIR}/www.conf && \
58+
apt-get clean -y && \
59+
apt-get autoclean -y && \
60+
apt-get remove -y wget curl lsb-release && \
61+
apt-get autoremove -y && \
62+
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
63+
64+
# FILES (it overrides originals)
65+
ADD conf.d/custom.ini ${PHP_MODS_DIR}/custom.ini
66+
ADD fpm/php-fpm.conf ${PHP_FPM_DIR}/php-fpm.conf
67+
68+
# WORKDIR
69+
WORKDIR /srv
70+
71+
# COMMAND
72+
CMD ["php-fpm8.5"]

8.5-fpm/conf.d/custom.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
; Update memory
2+
memory_limit = 521M
3+
upload_max_filesize = 256M
4+
post_max_size = 256M
5+
6+
; Dates
7+
date.timezone=Europe/Prague
8+
9+
; Mailer
10+
;sendmail_path = /usr/local/bin/phpmailer
11+
12+
; No disabled functions
13+
;disable_functions =

8.5-fpm/fpm/php-fpm.conf

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[global]
2+
3+
error_log = /proc/self/fd/2
4+
daemonize = no
5+
6+
[www]
7+
8+
access.log = /proc/self/fd/2
9+
10+
user = www-data
11+
group = www-data
12+
13+
listen = [::]:9000
14+
listen.owner = www-data
15+
listen.group = www-data
16+
listen.mode = 0660
17+
18+
pm = dynamic
19+
pm.max_children = 9
20+
pm.start_servers = 3
21+
pm.min_spare_servers = 2
22+
pm.max_spare_servers = 3
23+
pm.max_requests = 200
24+
catch_workers_output = yes
25+
clear_env = yes
26+
27+
php_admin_value[sendmail_path] = /usr/local/bin/phpmailer
28+
php_admin_value[open_basedir]= "/data:/srv:/var/tmp:/tmp"
29+
php_admin_value[upload_tmp_dir] = "/var/tmp"
30+
31+
include=/etc/php/8.5/fpm/pool.d/*.conf

8.5/Dockerfile

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
FROM dockette/debian:bullseye
2+
3+
LABEL maintainer="[email protected]"
4+
5+
# PHP
6+
ENV PHP_MODS_DIR=/etc/php/8.5/mods-available
7+
ENV PHP_CLI_DIR=/etc/php/8.5/cli
8+
ENV PHP_CLI_CONF_DIR=${PHP_CLI_DIR}/conf.d
9+
ENV PHP_CGI_DIR=/etc/php/8.5/cgi
10+
ENV PHP_CGI_CONF_DIR=${PHP_CGI_DIR}/conf.d
11+
ENV TZ=Europe/Prague
12+
13+
# INSTALLATION
14+
RUN apt update && apt dist-upgrade -y && \
15+
# DEPENDENCIES #############################################################
16+
apt install -y wget curl apt-transport-https ca-certificates lsb-release git unzip && \
17+
# PHP DEB.SURY.CZ ##########################################################
18+
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
19+
echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list && \
20+
apt update && \
21+
apt dist-upgrade -y && \
22+
apt install -y --no-install-recommends \
23+
php8.5-apcu \
24+
php8.5-bcmath \
25+
php8.5-bz2 \
26+
php8.5-calendar \
27+
php8.5-cgi \
28+
php8.5-cli \
29+
php8.5-ctype \
30+
php8.5-curl \
31+
php8.5-gettext \
32+
php8.5-gd \
33+
php8.5-intl \
34+
php8.5-imap \
35+
php8.5-ldap \
36+
php8.5-mbstring \
37+
php8.5-memcached \
38+
php8.5-mysql \
39+
php8.5-pdo \
40+
php8.5-pgsql \
41+
php8.5-soap \
42+
php8.5-sqlite3 \
43+
php8.5-zip \
44+
php8.5-xmlrpc \
45+
php8.5-xsl && \
46+
# COMPOSER #################################################################
47+
curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --2 && \
48+
# PHP MOD(s) ###############################################################
49+
ln -s ${PHP_MODS_DIR}/custom.ini ${PHP_CLI_CONF_DIR}/999-custom.ini && \
50+
ln -s ${PHP_MODS_DIR}/custom.ini ${PHP_CGI_CONF_DIR}/999-custom.ini && \
51+
# CLEAN UP #################################################################
52+
apt-get clean -y && \
53+
apt-get autoclean -y && \
54+
apt-get remove -y wget curl lsb-release && \
55+
apt-get autoremove -y && \
56+
rm -rf /var/lib/apt/lists/* /var/lib/log/* /tmp/* /var/tmp/*
57+
58+
# FILES (it overrides originals)
59+
ADD conf.d/custom.ini ${PHP_MODS_DIR}/custom.ini
60+
61+
# WORKDIR
62+
WORKDIR /srv
63+
64+
# COMMAND
65+
CMD ["php"]

8.5/conf.d/custom.ini

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
; Update memory
2+
memory_limit = 521M
3+
upload_max_filesize = 256M
4+
post_max_size = 256M
5+
6+
; Dates
7+
date.timezone=Europe/Prague
8+
9+
; Mailer
10+
;sendmail_path = /usr/local/bin/phpmailer
11+
12+
; No disabled functions
13+
;disable_functions =

Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,6 @@ build-8.2-fpm: _build-8.2-fpm
3131
build-8.3: _build-8.3
3232
build-8.3-fpm: _build-8.3-fpm
3333
build-8.4: _build-8.4
34-
build-8.4-fpm: _build-8.4-fpm
34+
build-8.4-fpm: _build-8.4-fpm
35+
build-8.5: _build-8.5
36+
build-8.5-fpm: _build-8.5-fpm

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<h1 align=center>Dockette / PHP</h1>
22

33
<p align=center>
4-
Ready-to-use Debian based images for PHP 5.6-8.4 with CLI or FPM and Composer preinstalled.
4+
Ready-to-use Debian based images for PHP 5.6-8.5 with CLI or FPM and Composer preinstalled.
55
</p>
66

77
<p align=center>
@@ -23,6 +23,8 @@
2323
## Usage
2424

2525
```
26+
docker run -v /path/to/site:/srv dockette/php:8.5
27+
docker run -v /path/to/site:/srv dockette/php:8.5-fpm
2628
docker run -v /path/to/site:/srv dockette/php:8.4
2729
docker run -v /path/to/site:/srv dockette/php:8.4-fpm
2830
docker run -v /path/to/site:/srv dockette/php:8.3
@@ -50,7 +52,7 @@ docker run -v /path/to/site:/srv dockette/php:5.6-fpm
5052
**Base image**
5153

5254
```Dockerfile
53-
FROM dockette/php:8.4-fpm
55+
FROM dockette/php:8.5-fpm
5456

5557
RUN apt update && apt install -y curl
5658
```
@@ -73,9 +75,9 @@ This super image has also preinstalled [Composer](https://getcomposer.org).
7375

7476
### Customization
7577

76-
In case of customization PHP 5.6 - 8.3:
78+
In case of customization PHP 5.6 - 8.5:
7779

78-
- /etc/php/{5.6-8.3}/{cli,cgi,fpm}/conf.d/991-custom.ini
80+
- /etc/php/{5.6-8.5}/{cli,cgi,fpm}/conf.d/991-custom.ini
7981

8082
## Development
8183

0 commit comments

Comments
 (0)