diff --git a/Dockerfile b/Dockerfile index 8c48d7b..c2fa225 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ ENV HOME=/config RUN \ apk add --no-cache \ + iputils \ grep \ php84-gd \ php84-intl \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 500a039..1a55bfc 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,6 +12,7 @@ ENV HOME=/config RUN \ apk add --no-cache \ + iputils \ grep \ php84-gd \ php84-intl \ diff --git a/Jenkinsfile b/Jenkinsfile index 07e45b2..1d4eda4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -916,6 +916,8 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ + -e COMMIT_SHA=\"${COMMIT_SHA}\" \ + -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } diff --git a/README.md b/README.md index 5dba9f7..7995b05 100644 --- a/README.md +++ b/README.md @@ -310,6 +310,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **11.10.25:** - Update nginx configs for v1.7.2. Existing users should update their nginx confs to avoid errors. * **05.07.25:** - Rebase to Alpine 3.22. * **20.12.24:** - Rebase to Alpine 3.21. * **07.06.24:** - Cache Filament components and added APP_KEY as a required param. diff --git a/package_versions.txt b/package_versions.txt index 38ed158..5b96136 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -7,7 +7,7 @@ alpine-keys 2.5-r0 apk alpine-release 3.22.2-r0 apk anourvalar/eloquent-serialize 1.3.4 php-composer aom-libs 3.12.1-r0 apk -apache2-utils 2.4.65-r0 apk +apache2-utils 2.4.66-r0 apk apk-tools 2.14.9-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk @@ -15,18 +15,21 @@ argon2-libs 20190702-r5 apk bash 5.2.37-r0 apk blade-ui-kit/blade-heroicons 2.6.0 php-composer blade-ui-kit/blade-icons 1.8.0 php-composer -brick/math 0.14.0 php-composer +brick/math 0.14.1 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r19 apk -busybox-binsh 1.37.0-r19 apk -c-ares 1.34.5-r0 apk +busybox 1.37.0-r20 apk +busybox-binsh 1.37.0-r20 apk +c-ares 1.34.6-r0 apk ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk carbonphp/carbon-doctrine-types 3.2.0 php-composer catatonit 0.2.1-r0 apk +chillerlan/php-qrcode 5.0.5 php-composer +chillerlan/php-settings-container 3.2.1 php-composer chrisullyott/php-filesize v4.2.1 php-composer clue/stream-filter v1.7.0 php-composer -composer 2.8.12 binary +codewithdennis/filament-simple-alert v4.0.2 php-composer +composer 2.9.5 binary coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk coreutils-fmt 9.7-r1 apk @@ -35,25 +38,24 @@ curl 8.14.1-r2 apk danharrin/date-format-converter v0.3.1 php-composer danharrin/livewire-rate-limiting v2.1.0 php-composer dflydev/dot-access-data v3.0.3 php-composer -doctrine/dbal 4.3.4 php-composer doctrine/deprecations 1.1.5 php-composer doctrine/inflector 2.1.0 php-composer doctrine/lexer 3.0.1 php-composer -dragonmantank/cron-expression v3.4.0 php-composer +dragonmantank/cron-expression v3.6.0 php-composer egulias/email-validator 4.0.4 php-composer -filament/actions v3.3.43 php-composer -filament/filament v3.3.43 php-composer -filament/forms v3.3.43 php-composer -filament/infolists v3.3.43 php-composer -filament/notifications v3.3.43 php-composer -filament/spatie-laravel-settings-plugin v3.3.43 php-composer -filament/support v3.3.43 php-composer -filament/tables v3.3.43 php-composer -filament/widgets v3.3.43 php-composer +filament/actions v4.1.0 php-composer +filament/filament v4.1.0 php-composer +filament/forms v4.1.0 php-composer +filament/infolists v4.1.0 php-composer +filament/notifications v4.1.0 php-composer +filament/schemas v4.1.0 php-composer +filament/spatie-laravel-settings-plugin v4.1.0 php-composer +filament/support v4.1.0 php-composer +filament/tables v4.1.0 php-composer +filament/widgets v4.1.0 php-composer findutils 4.10.0-r0 apk freetype 2.13.3-r0 apk -fruitcake/php-cors v1.3.0 php-composer -geerlingguy/ping 1.2.1 php-composer +fruitcake/php-cors v1.4.0 php-composer git 2.49.1-r0 apk git-init-template 2.49.1-r0 apk graham-campbell/result-type v1.1.3 php-composer @@ -65,27 +67,34 @@ guzzlehttp/uri-template v1.0.5 php-composer icu-data-en 76.1-r1 apk icu-libs 76.1-r1 apk influxdata/influxdb-client-php 3.8.0 php-composer -jq 1.8.0-r0 apk -kirschbaum-development/eloquent-power-joins 4.2.8 php-composer +iputils 20240905-r0 apk +iputils-arping 20240905-r0 apk +iputils-clockdiff 20240905-r0 apk +iputils-ping 20240905-r0 apk +iputils-tracepath 20240905-r0 apk +jq 1.8.1-r0 apk +kirschbaum-development/eloquent-power-joins 4.2.10 php-composer laravel-notification-channels/telegram 6.0.0 php-composer -laravel/framework v12.35.1 php-composer -laravel/prompts v0.3.7 php-composer -laravel/sanctum v4.2.0 php-composer -laravel/serializable-closure v2.0.6 php-composer -league/commonmark 2.7.1 php-composer +laravel/framework v12.41.1 php-composer +laravel/prompts v0.3.8 php-composer +laravel/sanctum v4.2.1 php-composer +laravel/serializable-closure v2.0.7 php-composer +league/commonmark 2.8.0 php-composer league/config v1.2.0 php-composer -league/csv 9.27.0 php-composer -league/flysystem 3.30.1 php-composer -league/flysystem-local 3.30.0 php-composer +league/csv 9.27.1 php-composer +league/flysystem 3.30.2 php-composer +league/flysystem-local 3.30.2 php-composer league/mime-type-detection 1.16.0 php-composer -league/uri 7.5.1 php-composer -league/uri-interfaces 7.5.0 php-composer +league/uri 7.6.0 php-composer +league/uri-components 7.6.0 php-composer +league/uri-interfaces 7.6.0 php-composer libapk2 2.14.9-r3 apk libattr 2.5.2-r2 apk libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.5.4-r0 apk +libcap2 2.76-r0 apk +libcrypto3 3.5.5-r0 apk libcurl 8.14.1-r2 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk @@ -97,13 +106,13 @@ libintl 0.24.1-r0 apk libjpeg-turbo 3.1.0-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20250503-r0 apk -libpng 1.6.47-r0 apk -libpq 17.6-r0 apk +libpng 1.6.54-r0 apk +libpq 17.7-r0 apk libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsharpyuv 1.5.0-r0 apk libsm 1.2.5-r0 apk -libssl3 3.5.4-r0 apk +libssl3 3.5.5-r0 apk libstdc++ 14.2.0-r6 apk libunistring 1.3-r0 apk libuuid 2.41-r9 apk @@ -119,7 +128,7 @@ libxt 1.3.1-r0 apk libyuv 0.0.1887.20251502-r1 apk libzip 1.11.4-r0 apk linux-pam 1.7.0-r4 apk -livewire/livewire v3.6.4 php-composer +livewire/livewire v3.7.1 php-composer logrotate 3.21.0-r1 apk lorisleiva/laravel-actions v2.9.1 php-composer lorisleiva/lody v0.6.0 php-composer @@ -132,61 +141,65 @@ musl-utils 1.2.5-r10 apk myclabs/php-enum 1.8.5 php-composer nano 8.4-r0 apk ncurses-terminfo-base 6.5_p20250503-r0 apk -nesbot/carbon 3.10.3 php-composer +nesbot/carbon 3.11.0 php-composer netcat-openbsd 1.229.1-r0 apk -nette/schema v1.3.2 php-composer -nette/utils v4.0.8 php-composer +nette/php-generator v4.2.0 php-composer +nette/schema v1.3.3 php-composer +nette/utils v4.1.0 php-composer nghttp2-libs 1.65.0-r0 apk nginx 1.28.0-r3 apk nikic/php-parser v5.6.2 php-composer -nunomaduro/termwind v2.3.2 php-composer +nunomaduro/termwind v2.3.3 php-composer oniguruma 6.9.10-r0 apk openspout/openspout v4.32.0 php-composer -openssl 3.5.4-r0 apk +openssl 3.5.5-r0 apk +paragonie/constant_time_encoding v3.1.3 php-composer pcre2 10.46-r0 apk -php-http/client-common 2.7.2 php-composer +php-http/client-common 2.7.3 php-composer php-http/discovery 1.20.0 php-composer php-http/httplug 2.4.1 php-composer php-http/message 1.16.2 php-composer php-http/promise 1.3.1 php-composer -php84 8.4.14-r0 apk -php84-common 8.4.14-r0 apk -php84-ctype 8.4.14-r0 apk -php84-curl 8.4.14-r0 apk -php84-dom 8.4.14-r0 apk -php84-fileinfo 8.4.14-r0 apk -php84-fpm 8.4.14-r0 apk -php84-gd 8.4.14-r0 apk -php84-iconv 8.4.14-r0 apk -php84-intl 8.4.14-r0 apk -php84-mbstring 8.4.14-r0 apk -php84-mysqlnd 8.4.14-r0 apk -php84-openssl 8.4.14-r0 apk -php84-pdo 8.4.14-r0 apk -php84-pdo_mysql 8.4.14-r0 apk -php84-pdo_pgsql 8.4.14-r0 apk -php84-pdo_sqlite 8.4.14-r0 apk +php84 8.4.16-r0 apk +php84-common 8.4.16-r0 apk +php84-ctype 8.4.16-r0 apk +php84-curl 8.4.16-r0 apk +php84-dom 8.4.16-r0 apk +php84-fileinfo 8.4.16-r0 apk +php84-fpm 8.4.16-r0 apk +php84-gd 8.4.16-r0 apk +php84-iconv 8.4.16-r0 apk +php84-intl 8.4.16-r0 apk +php84-mbstring 8.4.16-r0 apk +php84-mysqlnd 8.4.16-r0 apk +php84-openssl 8.4.16-r0 apk +php84-pdo 8.4.16-r0 apk +php84-pdo_mysql 8.4.16-r0 apk +php84-pdo_pgsql 8.4.16-r0 apk +php84-pdo_sqlite 8.4.16-r0 apk php84-pecl-igbinary 3.2.16-r1 apk php84-pecl-msgpack 3.0.0-r0 apk -php84-pecl-redis 6.2.0-r0 apk -php84-phar 8.4.14-r0 apk -php84-session 8.4.14-r0 apk -php84-simplexml 8.4.14-r0 apk -php84-sockets 8.4.14-r0 apk -php84-tokenizer 8.4.14-r0 apk -php84-xml 8.4.14-r0 apk -php84-xmlreader 8.4.14-r0 apk -php84-xmlwriter 8.4.14-r0 apk -php84-zip 8.4.14-r0 apk +php84-pecl-redis 6.3.0-r0 apk +php84-phar 8.4.16-r0 apk +php84-session 8.4.16-r0 apk +php84-simplexml 8.4.16-r0 apk +php84-sockets 8.4.16-r0 apk +php84-tokenizer 8.4.16-r0 apk +php84-xml 8.4.16-r0 apk +php84-xmlreader 8.4.16-r0 apk +php84-xmlwriter 8.4.16-r0 apk +php84-zip 8.4.16-r0 apk phpdocumentor/reflection-common 2.2.0 php-composer -phpdocumentor/type-resolver 1.10.0 php-composer +phpdocumentor/type-resolver 1.12.0 php-composer phpoption/phpoption 1.9.4 php-composer phpstan/phpdoc-parser 2.3.0 php-composer popt 1.19-r4 apk postgresql-common 1.2-r1 apk -postgresql16-client 16.10-r0 apk +postgresql16-client 16.11-r0 apk +pragmarx/google2fa v8.0.3 php-composer +pragmarx/google2fa-qrcode v3.0.1 php-composer procps-ng 4.0.4-r3 apk -psr/cache 3.0.0 php-composer +promphp/prometheus_client_php v2.14.1 php-composer psr/clock 1.0.0 php-composer psr/container 2.0.2 php-composer psr/event-dispatcher 1.0.0 php-composer @@ -200,36 +213,41 @@ ramsey/collection 2.1.1 php-composer ramsey/uuid 4.9.1 php-composer readline 8.2.13-r1 apk ryangjchandler/blade-capture-directive v1.1.0 php-composer +saloonphp/laravel-plugin v3.7.0 php-composer +saloonphp/saloon v3.14.2 php-composer scanelf 1.3.8-r1 apk +scrivo/highlight.php v9.18.1.10 php-composer secondnetwork/blade-tabler-icons v3.35.0 php-composer shadow 4.17.3-r0 apk +shiki-php UNKNOWN npm skalibs-libs 2.14.4.0-r0 apk -spatie/color 1.8.0 php-composer spatie/invade 2.1.0 php-composer spatie/laravel-json-api-paginate 1.16.3 php-composer spatie/laravel-package-tools 1.92.7 php-composer spatie/laravel-query-builder 6.3.6 php-composer -spatie/laravel-settings 3.5.0 php-composer +spatie/laravel-settings 3.6.0 php-composer spatie/laravel-webhook-server 3.8.3 php-composer +spatie/ping 1.1.1 php-composer +spatie/shiki-php 2.3.2 php-composer spatie/temporary-directory 2.3.0 php-composer sqlite-libs 3.49.2-r1 apk -ssl_client 1.37.0-r19 apk +ssl_client 1.37.0-r20 apk ssmtp 2.64-r22 apk swagger-php-tools 1.0.0 npm -symfony/clock v7.3.0 php-composer -symfony/console v7.3.4 php-composer -symfony/css-selector v7.3.0 php-composer +symfony/clock v8.0.0 php-composer +symfony/console v7.4.0 php-composer +symfony/css-selector v7.4.0 php-composer symfony/deprecation-contracts v3.6.0 php-composer -symfony/error-handler v7.3.4 php-composer -symfony/event-dispatcher v7.3.3 php-composer +symfony/error-handler v7.4.0 php-composer +symfony/event-dispatcher v8.0.0 php-composer symfony/event-dispatcher-contracts v3.6.0 php-composer -symfony/finder v7.3.2 php-composer -symfony/html-sanitizer v7.3.3 php-composer -symfony/http-foundation v7.3.4 php-composer -symfony/http-kernel v7.3.4 php-composer -symfony/mailer v7.3.4 php-composer -symfony/mime v7.3.4 php-composer -symfony/options-resolver v7.3.3 php-composer +symfony/finder v7.4.0 php-composer +symfony/html-sanitizer v7.4.0 php-composer +symfony/http-foundation v7.4.0 php-composer +symfony/http-kernel v7.4.0 php-composer +symfony/mailer v7.4.0 php-composer +symfony/mime v7.4.0 php-composer +symfony/options-resolver v8.0.0 php-composer symfony/polyfill-ctype v1.33.0 php-composer symfony/polyfill-intl-grapheme v1.33.0 php-composer symfony/polyfill-intl-idn v1.33.0 php-composer @@ -240,22 +258,23 @@ symfony/polyfill-php83 v1.33.0 php-composer symfony/polyfill-php84 v1.33.0 php-composer symfony/polyfill-php85 v1.33.0 php-composer symfony/polyfill-uuid v1.33.0 php-composer -symfony/process v7.3.4 php-composer -symfony/routing v7.3.4 php-composer -symfony/service-contracts v3.6.0 php-composer -symfony/string v7.3.4 php-composer -symfony/translation v7.3.4 php-composer -symfony/translation-contracts v3.6.0 php-composer -symfony/uid v7.3.1 php-composer -symfony/var-dumper v7.3.4 php-composer -symfony/yaml v7.3.3 php-composer +symfony/process v7.4.0 php-composer +symfony/routing v7.4.0 php-composer +symfony/service-contracts v3.6.1 php-composer +symfony/string v8.0.0 php-composer +symfony/translation v8.0.0 php-composer +symfony/translation-contracts v3.6.1 php-composer +symfony/uid v7.4.0 php-composer +symfony/var-dumper v7.4.0 php-composer +symfony/yaml v7.4.0 php-composer tijsverkoyen/css-to-inline-styles v2.3.0 php-composer -tzdata 2025b-r0 apk +tiptap-php UNKNOWN npm +tzdata 2025c-r0 apk +ueberdosis/tiptap-php 2.0.0 php-composer utmps-libs 0.1.3.1-r0 apk vlucas/phpdotenv v5.6.2 php-composer voku/portable-ascii 2.0.3 php-composer -webmozart/assert 1.12.0 php-composer xz-libs 5.8.1-r0 apk -zircote/swagger-php 5.5.1 php-composer +zircote/swagger-php 5.7.6 php-composer zlib 1.3.1-r2 apk zstd-libs 1.5.7-r0 apk diff --git a/readme-vars.yml b/readme-vars.yml index 6332fd3..c76f51f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -97,6 +97,7 @@ init_diagram: | "speedtest-tracker:latest" <- Base Images # changelog changelogs: + - {date: "11.10.25:", desc: "Update nginx configs for v1.7.2. Existing users should update their nginx confs to avoid errors."} - {date: "05.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "20.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "07.06.24:", desc: "Cache Filament components and added APP_KEY as a required param."} diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample new file mode 100644 index 0000000..d060ea6 --- /dev/null +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -0,0 +1,48 @@ +## Version 2025/11/10 - Changelog: https://github.com/linuxserver/docker-speedtest-tracker/commits/main/root/defaults/nginx/site-confs/default.conf.sample + +server { + listen 80 default_server; + listen [::]:80 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + listen 443 quic reuseport default_server; + listen [::]:443 quic reuseport default_server; + + server_name _; + + include /config/nginx/ssl.conf; + + set $root /app/www/public; + if (!-d /app/www/public) { + set $root /config/www; + } + root $root; + index index.html index.htm index.php; + + location / { + # enable for basic auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args; + } + + location ~ ^(.+\.php)(.*)$ { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + fastcgi_split_path_info ^(.+\.php)(.*)$; + if (!-f $document_root$fastcgi_script_name) { return 404; } + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + fastcgi_buffers 16 4k; + fastcgi_buffer_size 16k; + include /etc/nginx/fastcgi_params; + } + + # deny access to .htaccess/.htpasswd files + location ~ /\.ht { + deny all; + } +}