Update logspeedtest.py

Merge pull request 'Update Dockerfile' (#3 ) from paradizelost-patch-1 into main
Reviewed-on: #3
2024-12-04 09:12:00 -06:00 · 2024-11-27 10:50:24 -06:00 · 2024-11-27 10:47:14 -06:00 · 2024-11-27 10:46:44 -06:00 · 2024-11-26 14:41:41 -06:00 · 2024-11-26 14:33:46 -06:00
3 changed files with 6 additions and 9 deletions
--- a/5
+++ b/5
@@ -1,7 +1,8 @@
 FROM debian:bullseye-slim
 #
-COPY ookla_speedtest_cli.list /etc/apt/sources.list.d/
-RUN apt update && apt install python3 python3-pip iputils-ping speedtest -y
+RUN apt update && apt install curl -y
+RUN curl -s https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | bash
+RUN apt install python3 python3-pip iputils-ping speedtest -y
 COPY logspeedtest.py /usr/local/bin/
 COPY requirements.txt /
 COPY init.sh /
--- a/logspeedtest.py
+++ b/logspeedtest.py
@@ -20,7 +20,8 @@ infdbuser = os.environ["INFLUX_USER"]
 infdbpass = os.environ["INFLUX_PASSWORD"]
 influxuri = os.environ["INFLUX_URI"]
 while(True):
-    response = sp.getstatusoutput(f"speedtest --format=json")[1]
+    response = sp.getstatusoutput(f"speedtest --accept-license --format=json")[1]
+    print(response)
    respjson = json.loads(response.split("\n")[1])
    print(response)
    downspeed = respjson['download']['bandwidth'] * 8 / 1024 / 1024
--- a/ookla_speedtest_cli.list
+++ b/ookla_speedtest_cli.list
@@ -1,5 +0,0 @@
-# this file was generated by packagecloud.io for
-# the repository at https://packagecloud.io/ookla/speedtest-cli
-
-deb [signed-by=/etc/apt/keyrings/ookla_speedtest-cli-archive-keyring.gpg] https://packagecloud.io/ookla/speedtest-cli/debian/ bookworm main
-deb-src [signed-by=/etc/apt/keyrings/ookla_speedtest-cli-archive-keyring.gpg] https://packagecloud.io/ookla/speedtest-cli/debian/ bookworm main
Author	SHA1	Message	Date
paradizelost	06da5ef71a	Update logspeedtest.py All checks were successful / Plan (push) Successful in 3m6s Details	2024-12-04 09:12:00 -06:00
paradizelost	3633dd4787	Merge pull request 'Update Dockerfile' (#3 ) from paradizelost-patch-1 into main Reviewed-on: #3	2024-11-27 10:50:24 -06:00
paradizelost	03cf5b67c2	Delete ookla_speedtest_cli.list All checks were successful / Plan (push) Successful in 2m27s Details / Plan (pull_request) Successful in 7s Details / Deploy (pull_request) Successful in 41s Details	2024-11-27 10:47:14 -06:00
paradizelost	ede0e223ec	Update Dockerfile Some checks failed / Plan (push) Has been cancelled Details	2024-11-27 10:46:44 -06:00
paradizelost	6848570758	Merge pull request 'work' (#2 ) from work into main Reviewed-on: #2	2024-11-26 14:41:41 -06:00
Dan Hamik	ab6ca7fac6	accept speedest eula All checks were successful / Plan (push) Successful in 57s Details / Plan (pull_request) Successful in 16s Details / Deploy (pull_request) Successful in 13s Details	2024-11-26 14:33:46 -06:00
Dan Hamik	96b7f4cbc0	adding logging All checks were successful / Plan (push) Successful in 1m5s Details	2024-11-26 14:31:41 -06:00
paradizelost	056c0b545e	Merge pull request 'work' (#1 ) from work into main Reviewed-on: #1	2024-11-26 14:27:40 -06:00
Dan Hamik	6616bf7fae	forgot the -y All checks were successful / Plan (push) Successful in 3m1s Details / Plan (pull_request) Successful in 17s Details / Deploy (pull_request) Successful in 6s Details	2024-11-26 13:30:05 -06:00
Dan Hamik	192fc55105	move to installing via the ookla method Some checks failed / Plan (push) Failing after 15s Details	2024-11-26 13:29:04 -06:00
Dan Hamik	7948c548e3	list change Some checks failed / Plan (push) Failing after 16s Details	2024-11-26 13:25:42 -06:00
Dan Hamik	738df45609	force build Some checks failed / Plan (push) Failing after 14s Details	2024-11-26 13:23:18 -06:00