Skip to content

Commit 43b0306

Browse files
committed
Merge pull request #84 from LibreCodeCoop/chore/add-support-to-php-8.3
chore: add support to php 8.3
2 parents 6bed8db + d36741e commit 43b0306

File tree

4 files changed

+56
-47
lines changed

4 files changed

+56
-47
lines changed

.docker/Dockerfile.php81

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
FROM php:8.1-fpm
22

3-
RUN apt-get update \
4-
&& apt-get install -y \
5-
git \
6-
jq \
7-
libicu-dev \
8-
libzip-dev \
9-
procps \
10-
unzip \
11-
# cron
12-
busybox-static \
13-
&& mkdir -p /var/spool/cron/crontabs \
14-
&& echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
15-
163
# Install PHP extensions
174
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
185
RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
@@ -41,20 +28,36 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
4128
sysvsem \
4229
xdebug \
4330
zip \
31+
@composer \
4432
&& rm /usr/local/bin/install-php-extensions \
4533
# make possible ImageMagic handle PDF files
4634
&& sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' /etc/ImageMagick-6/policy.xml \
4735
# pevent errors when try to create files at /var/www with user www-data
4836
&& chown -R www-data /var/www
4937

38+
# Run separate to prevent build all extensions
39+
RUN apt-get update \
40+
&& apt-get install -y \
41+
git \
42+
jq \
43+
libicu-dev \
44+
libzip-dev \
45+
poppler-utils \
46+
procps \
47+
unzip \
48+
# cron
49+
busybox-static \
50+
&& mkdir -p /var/spool/cron/crontabs \
51+
&& echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data \
52+
&& rm -rf /var/lib/apt/lists/*
53+
5054
# Install NVM
5155
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
5256
&& export NVM_DIR="/root/.nvm" \
5357
&& . "$NVM_DIR/nvm.sh" \
54-
&& nvm install 14 && nvm install 16 && nvm install 20 \
58+
&& nvm install 20 \
5559
&& nvm alias default 20
5660

57-
COPY --from=composer /usr/bin/composer /usr/bin/composer
5861
COPY config/php/* /usr/local/etc/php/conf.d/
5962
COPY scripts/* /var/www/scripts/
6063
COPY bin/* /usr/local/bin/

.docker/Dockerfile.php82

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,5 @@
11
FROM php:8.2-fpm
22

3-
RUN apt-get update \
4-
&& apt-get install -y \
5-
git \
6-
jq \
7-
libicu-dev \
8-
libzip-dev \
9-
procps \
10-
unzip \
11-
# cron
12-
busybox-static \
13-
&& mkdir -p /var/spool/cron/crontabs \
14-
&& echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
15-
163
# Install PHP extensions
174
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
185
RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
@@ -41,20 +28,36 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
4128
sysvsem \
4229
xdebug \
4330
zip \
31+
@composer \
4432
&& rm /usr/local/bin/install-php-extensions \
4533
# make possible ImageMagic handle PDF files
4634
&& sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' /etc/ImageMagick-6/policy.xml \
4735
# pevent errors when try to create files at /var/www with user www-data
4836
&& chown -R www-data /var/www
4937

38+
# Run separate to prevent build all extensions
39+
RUN apt-get update \
40+
&& apt-get install -y \
41+
git \
42+
jq \
43+
libicu-dev \
44+
libzip-dev \
45+
poppler-utils \
46+
procps \
47+
unzip \
48+
# cron
49+
busybox-static \
50+
&& mkdir -p /var/spool/cron/crontabs \
51+
&& echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data \
52+
&& rm -rf /var/lib/apt/lists/*
53+
5054
# Install NVM
5155
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
5256
&& export NVM_DIR="/root/.nvm" \
5357
&& . "$NVM_DIR/nvm.sh" \
54-
&& nvm install 14 && nvm install 16 && nvm install 20 \
58+
&& nvm install 20 \
5559
&& nvm alias default 20
5660

57-
COPY --from=composer /usr/bin/composer /usr/bin/composer
5861
COPY config/php/* /usr/local/etc/php/conf.d/
5962
COPY scripts/* /var/www/scripts/
6063
COPY bin/* /usr/local/bin/

.docker/Dockerfile.php80 renamed to .docker/Dockerfile.php83

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
FROM php:8.0-fpm
2-
3-
RUN apt-get update \
4-
&& apt-get install -y \
5-
git \
6-
jq \
7-
libicu-dev \
8-
libzip-dev \
9-
procps \
10-
unzip \
11-
# cron
12-
busybox-static \
13-
&& mkdir -p /var/spool/cron/crontabs \
14-
&& echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
1+
FROM php:8.3-fpm
152

163
# Install PHP extensions
174
ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
@@ -41,20 +28,36 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync \
4128
sysvsem \
4229
xdebug \
4330
zip \
31+
@composer \
4432
&& rm /usr/local/bin/install-php-extensions \
4533
# make possible ImageMagic handle PDF files
4634
&& sed -i'' 's|.*<policy domain="coder".*"PDF".*|<policy domain="coder" rights="read \| write" pattern="PDF" />|g' /etc/ImageMagick-6/policy.xml \
4735
# pevent errors when try to create files at /var/www with user www-data
4836
&& chown -R www-data /var/www
4937

38+
# Run separate to prevent build all extensions
39+
RUN apt-get update \
40+
&& apt-get install -y \
41+
git \
42+
jq \
43+
libicu-dev \
44+
libzip-dev \
45+
poppler-utils \
46+
procps \
47+
unzip \
48+
# cron
49+
busybox-static \
50+
&& mkdir -p /var/spool/cron/crontabs \
51+
&& echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data \
52+
&& rm -rf /var/lib/apt/lists/*
53+
5054
# Install NVM
5155
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash \
5256
&& export NVM_DIR="/root/.nvm" \
5357
&& . "$NVM_DIR/nvm.sh" \
54-
&& nvm install 14 && nvm install 16 && nvm install 20 \
58+
&& nvm install 20 \
5559
&& nvm alias default 20
5660

57-
COPY --from=composer /usr/bin/composer /usr/bin/composer
5861
COPY config/php/* /usr/local/etc/php/conf.d/
5962
COPY scripts/* /var/www/scripts/
6063
COPY bin/* /usr/local/bin/

.docker/nginx/nginx.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ http {
9797
# only for Nextcloud like below:
9898
include mime.types;
9999
types {
100-
text/javascript js mjs;
100+
application/javascript js mjs;
101101
}
102102

103103
# Specify how to handle directories -- specifying `/index.php$request_uri`

0 commit comments

Comments
 (0)