Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

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

ARG BUILD_DATE
ARG VERSION
Expand All @@ -13,14 +13,14 @@ ENV HOME=/config
RUN \
apk add --no-cache \
grep \
php82-gd \
php82-intl \
php82-pdo_mysql \
php82-pdo_pgsql \
php82-pdo_sqlite \
php82-pecl-redis \
php82-tokenizer \
php82-xmlreader \
php83-gd \
php83-intl \
php83-pdo_mysql \
php83-pdo_pgsql \
php83-pdo_sqlite \
php83-pecl-redis \
php83-tokenizer \
php83-xmlreader \
postgresql15-client \
ssmtp && \
apk add --no-cache --virtual=build-dependencies \
Expand All @@ -38,9 +38,9 @@ RUN \
/tmp/speedtest-cli.tgz -C \
/usr/bin && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
echo "*** install speedtest-tracker ***" && \
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
Expand All @@ -64,12 +64,12 @@ RUN \
echo "**** setup php opcache ****" && \
{ \
echo 'opcache.enable_cli=1'; \
} > /etc/php82/conf.d/opcache-recommended.ini; \
} > /etc/php83/conf.d/opcache-recommended.ini; \
{ \
echo 'post_max_size = 100M'; \
echo 'upload_max_filesize = 100M'; \
echo 'variables_order = EGPCS'; \
} > /etc/php82/conf.d/php-misc.ini && \
} > /etc/php83/conf.d/php-misc.ini && \
echo "**** cleanup ****" && \
apk del --purge build-dependencies && \
rm -rf \
Expand Down
28 changes: 14 additions & 14 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

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

ARG BUILD_DATE
ARG VERSION
Expand All @@ -13,14 +13,14 @@ ENV HOME=/config
RUN \
apk add --no-cache \
grep \
php82-gd \
php82-intl \
php82-pdo_mysql \
php82-pdo_pgsql \
php82-pdo_sqlite \
php82-pecl-redis \
php82-tokenizer \
php82-xmlreader \
php83-gd \
php83-intl \
php83-pdo_mysql \
php83-pdo_pgsql \
php83-pdo_sqlite \
php83-pecl-redis \
php83-tokenizer \
php83-xmlreader \
postgresql15-client \
ssmtp && \
apk add --no-cache --virtual=build-dependencies \
Expand All @@ -38,9 +38,9 @@ RUN \
/tmp/speedtest-cli.tgz -C \
/usr/bin && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
echo "*** install speedtest-tracker ***" && \
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
Expand All @@ -64,12 +64,12 @@ RUN \
echo "**** setup php opcache ****" && \
{ \
echo 'opcache.enable_cli=1'; \
} > /etc/php82/conf.d/opcache-recommended.ini; \
} > /etc/php83/conf.d/opcache-recommended.ini; \
{ \
echo 'post_max_size = 100M'; \
echo 'upload_max_filesize = 100M'; \
echo 'variables_order = EGPCS'; \
} > /etc/php82/conf.d/php-misc.ini && \
} > /etc/php83/conf.d/php-misc.ini && \
echo "**** cleanup ****" && \
apk del --purge build-dependencies && \
rm -rf \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pipeline {
CI_WEB='true'
CI_PORT='80'
CI_SSL='false'
CI_DELAY='120'
CI_DELAY='60'
CI_DOCKERENV='TZ=Europe/London'
CI_AUTH='user:password'
CI_WEBPATH=''
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,4 +292,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **16.04.24:** - Rebase to alpine 3.19, upgrade to php 8.3.
* **10.02.24:** - Initial Release.
2 changes: 1 addition & 1 deletion jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ repo_vars:
- CI_WEB='true'
- CI_PORT='80'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DELAY='60'
- CI_DOCKERENV='TZ=Europe/London'
- CI_AUTH='user:password'
- CI_WEBPATH=''
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ app_setup_block: |

# changelog
changelogs:
- { date: "16.04.24:", desc: "Rebase to alpine 3.19, upgrade to php 8.3." }
- { date: "10.02.24:", desc: "Initial Release." }