From 4cf6164459d5b29346c921ed3ebef76a45d37cab Mon Sep 17 00:00:00 2001 From: Henry Whitaker Date: Sun, 20 Dec 2020 01:17:32 +0000 Subject: [PATCH] Added in modified files --- Dockerfile | 2 ++ arm.Dockerfile | 4 ++-- conf/etc/cont-init.d/50-speedtest | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f7daa96..2ea50363 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ FROM linuxserver/nginx LABEL maintainer=henrywhitaker3@outlook.com +ENV arch='x86_64' + COPY conf/ / EXPOSE 80 443 diff --git a/arm.Dockerfile b/arm.Dockerfile index d39c36c2..ccd1d735 100644 --- a/arm.Dockerfile +++ b/arm.Dockerfile @@ -1,9 +1,9 @@ FROM linuxserver/nginx:arm32v7-latest LABEL maintainer=henrywhitaker3@outlook.com -COPY conf/ / +ENV arch='arm' -RUN sed -i "s/1\.0\.0-x86_64/1\.0\.0-arm/" /etc/cont-init.d/50-speedtest +COPY conf/ / EXPOSE 80 443 diff --git a/conf/etc/cont-init.d/50-speedtest b/conf/etc/cont-init.d/50-speedtest index e1d7a841..937bd74a 100644 --- a/conf/etc/cont-init.d/50-speedtest +++ b/conf/etc/cont-init.d/50-speedtest @@ -22,7 +22,7 @@ else if [ ! -f /config/www/app/Bin/speedtest ]; then echo "Ookla GDPR and EULA accepted. Downloading Speedtest CLI." cd /tmp - wget https://bintray.com/ookla/download/download_file?file_path=ookla-speedtest-1.0.0-x86_64-linux.tgz -O speedtest.tgz > /dev/null + wget https://bintray.com/ookla/download/download_file?file_path=ookla-speedtest-1.0.0-$arch-linux.tgz -O speedtest.tgz > /dev/null tar zxvf speedtest.tgz > /dev/null cp speedtest /site/app/Bin/