Upgrade Docker image to PHP 8.2
This commit is contained in:
parent
e7fcf07c92
commit
e08335e0b1
10
Dockerfile
10
Dockerfile
|
|
@ -17,12 +17,12 @@ EXPOSE 80 443
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
|
|
||||||
RUN apk --no-cache --update add \
|
RUN apk --no-cache --update add \
|
||||||
tzdata openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php81 php81-phar php81-curl \
|
tzdata openssl unzip nginx bash ca-certificates s6 curl ssmtp mailx php82 php82-phar php82-curl \
|
||||||
php81-fpm php81-json php81-zlib php81-xml php81-dom php81-ctype php81-opcache php81-zip php81-iconv \
|
php82-fpm php82-json php82-zlib php82-xml php82-dom php82-ctype php82-opcache php82-zip php82-iconv \
|
||||||
php81-pdo php81-pdo_mysql php81-pdo_sqlite php81-pdo_pgsql php81-mbstring php81-session php81-bcmath \
|
php82-pdo php82-pdo_mysql php82-pdo_sqlite php82-pdo_pgsql php82-mbstring php82-session php82-bcmath \
|
||||||
php81-gd php81-openssl php81-sockets php81-posix php81-ldap php81-simplexml && \
|
php82-gd php82-openssl php82-sockets php82-posix php82-ldap php82-simplexml && \
|
||||||
rm -rf /var/www/localhost && \
|
rm -rf /var/www/localhost && \
|
||||||
rm -f /etc/php81/php-fpm.d/www.conf
|
rm -f /etc/php82/php-fpm.d/www.conf
|
||||||
|
|
||||||
ADD . /var/www/app
|
ADD . /var/www/app
|
||||||
ADD docker/ /
|
ADD docker/ /
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ class Thumbnail
|
||||||
imagealphablending($this->dstImage, false);
|
imagealphablending($this->dstImage, false);
|
||||||
imagesavealpha($this->dstImage, true);
|
imagesavealpha($this->dstImage, true);
|
||||||
|
|
||||||
imagecopyresampled($this->dstImage, $this->srcImage, $dstX, $dstY, 0, 0, $dstWidth, $dstHeight, $srcWidth, $srcHeight);
|
imagecopyresampled($this->dstImage, $this->srcImage, (int) $dstX, (int) $dstY, 0, 0, (int) $dstWidth, (int) $dstHeight, (int) $srcWidth, (int) $srcHeight);
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
0 8 * * * cd /var/www/app && ./cli cronjob >/dev/null 2>&1
|
0 8 * * * cd /var/www/app && php82 ./cli cronjob >/dev/null 2>&1
|
||||||
|
|
|
||||||
|
|
@ -16,4 +16,4 @@ pm.start_servers = 1
|
||||||
pm.min_spare_servers = 1
|
pm.min_spare_servers = 1
|
||||||
pm.max_spare_servers = 3
|
pm.max_spare_servers = 3
|
||||||
pm.max_requests = 2048
|
pm.max_requests = 2048
|
||||||
include = /etc/php81/php-fpm.d/env.conf
|
include = /etc/php82/php-fpm.d/env.conf
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
#!/bin/execlineb -P
|
#!/bin/execlineb -P
|
||||||
php-fpm81 -F
|
php-fpm82 -F
|
||||||
Loading…
Reference in New Issue