Skip to content

Commit c58239c

Browse files
committed
rebase to alpine 3.19, upgrade to php 8.3
1 parent df2b54e commit c58239c

File tree

6 files changed

+32
-30
lines changed

6 files changed

+32
-30
lines changed

Dockerfile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
44

55
ARG BUILD_DATE
66
ARG VERSION
@@ -13,14 +13,14 @@ ENV HOME=/config
1313
RUN \
1414
apk add --no-cache \
1515
grep \
16-
php82-gd \
17-
php82-intl \
18-
php82-pdo_mysql \
19-
php82-pdo_pgsql \
20-
php82-pdo_sqlite \
21-
php82-pecl-redis \
22-
php82-tokenizer \
23-
php82-xmlreader \
16+
php83-gd \
17+
php83-intl \
18+
php83-pdo_mysql \
19+
php83-pdo_pgsql \
20+
php83-pdo_sqlite \
21+
php83-pecl-redis \
22+
php83-tokenizer \
23+
php83-xmlreader \
2424
postgresql15-client \
2525
ssmtp && \
2626
apk add --no-cache --virtual=build-dependencies \
@@ -38,9 +38,9 @@ RUN \
3838
/tmp/speedtest-cli.tgz -C \
3939
/usr/bin && \
4040
echo "**** configure php-fpm to pass env vars ****" && \
41-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
42-
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
43-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
41+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
42+
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
43+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
4444
echo "*** install speedtest-tracker ***" && \
4545
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
4646
SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
@@ -64,12 +64,12 @@ RUN \
6464
echo "**** setup php opcache ****" && \
6565
{ \
6666
echo 'opcache.enable_cli=1'; \
67-
} > /etc/php82/conf.d/opcache-recommended.ini; \
67+
} > /etc/php83/conf.d/opcache-recommended.ini; \
6868
{ \
6969
echo 'post_max_size = 100M'; \
7070
echo 'upload_max_filesize = 100M'; \
7171
echo 'variables_order = EGPCS'; \
72-
} > /etc/php82/conf.d/php-misc.ini && \
72+
} > /etc/php83/conf.d/php-misc.ini && \
7373
echo "**** cleanup ****" && \
7474
apk del --purge build-dependencies && \
7575
rm -rf \

Dockerfile.aarch64

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
44

55
ARG BUILD_DATE
66
ARG VERSION
@@ -13,14 +13,14 @@ ENV HOME=/config
1313
RUN \
1414
apk add --no-cache \
1515
grep \
16-
php82-gd \
17-
php82-intl \
18-
php82-pdo_mysql \
19-
php82-pdo_pgsql \
20-
php82-pdo_sqlite \
21-
php82-pecl-redis \
22-
php82-tokenizer \
23-
php82-xmlreader \
16+
php83-gd \
17+
php83-intl \
18+
php83-pdo_mysql \
19+
php83-pdo_pgsql \
20+
php83-pdo_sqlite \
21+
php83-pecl-redis \
22+
php83-tokenizer \
23+
php83-xmlreader \
2424
postgresql15-client \
2525
ssmtp && \
2626
apk add --no-cache --virtual=build-dependencies \
@@ -38,9 +38,9 @@ RUN \
3838
/tmp/speedtest-cli.tgz -C \
3939
/usr/bin && \
4040
echo "**** configure php-fpm to pass env vars ****" && \
41-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
42-
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
43-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
41+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
42+
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
43+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
4444
echo "*** install speedtest-tracker ***" && \
4545
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
4646
SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
@@ -64,12 +64,12 @@ RUN \
6464
echo "**** setup php opcache ****" && \
6565
{ \
6666
echo 'opcache.enable_cli=1'; \
67-
} > /etc/php82/conf.d/opcache-recommended.ini; \
67+
} > /etc/php83/conf.d/opcache-recommended.ini; \
6868
{ \
6969
echo 'post_max_size = 100M'; \
7070
echo 'upload_max_filesize = 100M'; \
7171
echo 'variables_order = EGPCS'; \
72-
} > /etc/php82/conf.d/php-misc.ini && \
72+
} > /etc/php83/conf.d/php-misc.ini && \
7373
echo "**** cleanup ****" && \
7474
apk del --purge build-dependencies && \
7575
rm -rf \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pipeline {
3333
CI_WEB='true'
3434
CI_PORT='80'
3535
CI_SSL='false'
36-
CI_DELAY='120'
36+
CI_DELAY='60'
3737
CI_DOCKERENV='TZ=Europe/London'
3838
CI_AUTH='user:password'
3939
CI_WEBPATH=''

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,4 +292,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
292292

293293
## Versions
294294

295+
* **16.04.24:** - Rebase to alpine 3.19, upgrade to php 8.3.
295296
* **10.02.24:** - Initial Release.

jenkins-vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ repo_vars:
2323
- CI_WEB='true'
2424
- CI_PORT='80'
2525
- CI_SSL='false'
26-
- CI_DELAY='120'
26+
- CI_DELAY='60'
2727
- CI_DOCKERENV='TZ=Europe/London'
2828
- CI_AUTH='user:password'
2929
- CI_WEBPATH=''

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,5 @@ app_setup_block: |
4444
4545
# changelog
4646
changelogs:
47+
- { date: "16.04.24:", desc: "Rebase to alpine 3.19, upgrade to php 8.3." }
4748
- { date: "10.02.24:", desc: "Initial Release." }

0 commit comments

Comments
 (0)