Skip to content

Commit 3633f64

Browse files
committed
docker
1 parent 00433e1 commit 3633f64

File tree

2 files changed

+8
-26
lines changed

2 files changed

+8
-26
lines changed

Dockerfile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
44

55
ARG BUILD_DATE
66
ARG VERSION
7-
ARG SPEEDTEST_TRACKER_VERSION
87
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
98
LABEL maintainer="thespad"
109

1110
ENV HOME=/config
1211

12+
# Copy local speedtest-tracker source instead of downloading from GitHub
13+
COPY speedtest-tracker/ /app/www/
14+
1315
RUN \
1416
apk add --no-cache \
1517
iputils \
@@ -43,17 +45,6 @@ RUN \
4345
if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
4446
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
4547
echo "*** install speedtest-tracker ***" && \
46-
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
47-
SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
48-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
49-
fi && \
50-
curl -o \
51-
/tmp/speedtest-tracker.tar.gz -L \
52-
"https://github.com/alexjustesen/speedtest-tracker/archive/${SPEEDTEST_TRACKER_VERSION}.tar.gz" && \
53-
mkdir -p /app/www && \
54-
tar xzf \
55-
/tmp/speedtest-tracker.tar.gz -C \
56-
/app/www/ --strip-components=1 && \
5748
cd /app/www && \
5849
composer install \
5950
--no-interaction \
@@ -80,6 +71,6 @@ RUN \
8071
/app/www/node_modules \
8172
/tmp/*
8273

83-
COPY root/ /
74+
COPY docker-speedtest-tracker/root/ /
8475

8576
VOLUME /config

Dockerfile.aarch64

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
44

55
ARG BUILD_DATE
66
ARG VERSION
7-
ARG SPEEDTEST_TRACKER_VERSION
87
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
98
LABEL maintainer="thespad"
109

1110
ENV HOME=/config
1211

12+
# Copy local speedtest-tracker source instead of downloading from GitHub
13+
COPY speedtest-tracker/ /app/www/
14+
1315
RUN \
1416
apk add --no-cache \
1517
iputils \
@@ -43,17 +45,6 @@ RUN \
4345
if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
4446
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
4547
echo "*** install speedtest-tracker ***" && \
46-
if [ -z ${SPEEDTEST_TRACKER_VERSION+x} ]; then \
47-
SPEEDTEST_TRACKER_VERSION=$(curl -sX GET "https://api.github.com/repos/alexjustesen/speedtest-tracker/releases/latest" \
48-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
49-
fi && \
50-
curl -o \
51-
/tmp/speedtest-tracker.tar.gz -L \
52-
"https://github.com/alexjustesen/speedtest-tracker/archive/${SPEEDTEST_TRACKER_VERSION}.tar.gz" && \
53-
mkdir -p /app/www && \
54-
tar xzf \
55-
/tmp/speedtest-tracker.tar.gz -C \
56-
/app/www/ --strip-components=1 && \
5748
cd /app/www && \
5849
composer install \
5950
--no-interaction \
@@ -80,6 +71,6 @@ RUN \
8071
/app/www/node_modules \
8172
/tmp/*
8273

83-
COPY root/ /
74+
COPY docker-speedtest-tracker/root/ /
8475

8576
VOLUME /config

0 commit comments

Comments
 (0)