fix(api,docker): fixed speedtest install

MauriceNino · Jun 12, 2022 · 2ae1be2 · 2ae1be2
1 parent 26267b2
commit 2ae1be2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,22 +16,19 @@ RUN \
   if [ "$TARGETPLATFORM" = "linux/amd64" ] || [ "$(uname -m)" = "x86_64" ]; \
     then \
       wget -qO- https://install.speedtest.net/app/cli/ookla-speedtest-1.1.1-linux-x86_64.tgz \
-        | tar xmoz -C /bin speedtest &&\
-      mv /bin/speedtest /bin/speedtest_ookla &&\
-      speedtest_ookla --accept-license --accept-gdpr > /dev/null; \
+        | tar xmoz -C /usr/bin speedtest &&\
+      speedtest --accept-license --accept-gdpr > /dev/null; \
   elif [ "$TARGETPLATFORM" = "linux/arm64" ] || [ "$(uname -m)" = "aarch64" ]; \
     then \
       wget -qO- https://install.speedtest.net/app/cli/ookla-speedtest-1.1.1-linux-aarch64.tgz \
-        | tar xmoz -C /bin speedtest &&\
-      mv /bin/speedtest /bin/speedtest_ookla &&\
-      speedtest_ookla --accept-license --accept-gdpr > /dev/null &&\
+        | tar xmoz -C /usr/bin speedtest &&\
+      speedtest --accept-license --accept-gdpr > /dev/null &&\
       apk --no-cache add raspberrypi; \
   elif [ "$TARGETPLATFORM" = "linux/arm/v7" ]; \
     then \
       wget -qO- https://install.speedtest.net/app/cli/ookla-speedtest-1.1.1-linux-armhf.tgz \
-        | tar xmoz -C /bin speedtest &&\
-      mv /bin/speedtest /bin/speedtest_ookla &&\
-      speedtest_ookla --accept-license --accept-gdpr > /dev/null &&\
+        | tar xmoz -C /usr/bin speedtest &&\
+      speedtest --accept-license --accept-gdpr > /dev/null &&\
       apk --no-cache add raspberrypi; \
   else echo "Unsupported platform"; exit 1; \
   fi

diff --git a/apps/api/src/static-info.ts b/apps/api/src/static-info.ts
@@ -145,9 +145,9 @@ const commandExists = async (command: string): Promise<boolean> => {
 
 export const runSpeedTest = async (): Promise<void> => {
   let usedRunner;
-  if (CONFIG.accept_ookla_eula && (await commandExists('speedtest_ookla'))) {
+  if (CONFIG.accept_ookla_eula && (await commandExists('speedtest'))) {
     usedRunner = 'ookla';
-    const { stdout } = await exec('speedtest_ookla -f json');
+    const { stdout } = await exec('speedtest -f json');
     const json = JSON.parse(stdout);
 
     STATIC_INFO.network.speedDown =
@@ -156,9 +156,9 @@ export const runSpeedTest = async (): Promise<void> => {
       json.upload.bandwidth * 8 ?? STATIC_INFO.network.speedUp;
     STATIC_INFO.network.publicIp =
       json.interface.externalIp ?? STATIC_INFO.network.publicIp;
-  } else if (await commandExists('speedtest')) {
+  } else if (await commandExists('speedtest-cli')) {
     usedRunner = 'speedtest-cli';
-    const { stdout } = await exec('speedtest --json');
+    const { stdout } = await exec('speedtest-cli --json');
     const json = JSON.parse(stdout);
 
     STATIC_INFO.network.speedDown =