Skip to content

Commit 6441fa7

Browse files
committed
feat(core): bump to php 8.2
1 parent c4b3dce commit 6441fa7

File tree

9 files changed

+44
-450
lines changed

9 files changed

+44
-450
lines changed

Dockerfile

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.16
1+
FROM alpine:3.18
22

33
LABEL maintainers="Vincent BESANCON <[email protected]>"
44

@@ -17,6 +17,7 @@ ENV \
1717
TTRSS_DB_TYPE="pgsql" \
1818
TTRSS_DB_USER="ttrss" \
1919
TTRSS_DIGEST_SUBJECT="[rss] News headlines on last 24 hours" \
20+
TTRSS_PHP_EXECUTABLE="/usr/bin/php82" \
2021
TTRSS_PLUGINS="auth_internal,note,import_export" \
2122
TTRSS_SELF_URL_PATH="http://localhost:8000/" \
2223
TTRSS_SMTP_FROM_ADDRESS="[email protected]" \
@@ -41,27 +42,27 @@ RUN echo "➔ Installing system packages..." \
4142
netcat-openbsd \
4243
nginx \
4344
openssl \
44-
php8 \
45-
php8-ctype \
46-
php8-curl \
47-
php8-dom \
48-
php8-fileinfo \
49-
php8-fpm \
50-
php8-gd \
51-
php8-iconv \
52-
php8-intl \
53-
php8-mbstring \
54-
php8-mysqlnd \
55-
php8-opcache \
56-
php8-openssl \
57-
php8-pcntl \
58-
php8-pdo_mysql \
59-
php8-pdo_pgsql \
60-
php8-pgsql \
61-
php8-posix \
62-
php8-session \
63-
php8-tokenizer \
64-
php8-xsl \
45+
php82 \
46+
php82-ctype \
47+
php82-curl \
48+
php82-dom \
49+
php82-fileinfo \
50+
php82-fpm \
51+
php82-gd \
52+
php82-iconv \
53+
php82-intl \
54+
php82-mbstring \
55+
php82-mysqlnd \
56+
php82-opcache \
57+
php82-openssl \
58+
php82-pcntl \
59+
php82-pdo_mysql \
60+
php82-pdo_pgsql \
61+
php82-pgsql \
62+
php82-posix \
63+
php82-session \
64+
php82-tokenizer \
65+
php82-xsl \
6566
supervisor \
6667
&& echo "✔️ Successfully installed system packages. Done."
6768

@@ -113,8 +114,8 @@ COPY nginx/conf.d/ttrss.conf /etc/nginx/http.d/ttrss.conf
113114
RUN rm /etc/nginx/http.d/default.conf
114115

115116
# PHP / PHP-FPM configuration
116-
COPY php8/php-fpm.d/*.conf /etc/php8/php-fpm.d/
117-
COPY php8/conf.d/*.ini /etc/php8/conf.d/
117+
COPY php82/php-fpm.d/*.conf /etc/php82/php-fpm.d/
118+
COPY php82/conf.d/*.ini /etc/php82/conf.d/
118119

119120
# Listening ports
120121
EXPOSE 80

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ clean-tests:
2121

2222
.PHONY: tests-image
2323
tests-image:
24-
@docker build --rm --no-cache --tag $(IMAGE) .
24+
@docker build --progress=plain --rm --no-cache --tag $(IMAGE) .
2525

2626
.PHONY: tests-mysql
2727
tests-mysql:

entrypoint.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ do
1111
done
1212

1313
# Run migrations
14-
su nginx -s /bin/sh -c "php /srv/ttrss/update.php --update-schema=force-yes" || exit 1
14+
su nginx -s /bin/sh -c "/usr/bin/php82 /srv/ttrss/update.php --update-schema=force-yes" || exit 1
1515

1616
# Configure mail sending
1717
touch /etc/msmtprc
@@ -20,4 +20,4 @@ chmod 0400 /etc/msmtprc
2020
envsubst < /var/tmp/msmtprc.tpl > /etc/msmtprc
2121

2222
# Relay to supervisord
23-
exec supervisord -c /supervisord.conf
23+
exec supervisord -n -c /supervisord.conf

0 commit comments

Comments
 (0)