From be9e7501deb2a3c076b1ec16cd4a7fc5e0959750 Mon Sep 17 00:00:00 2001 From: Michael Oberdorf Date: Sat, 28 Oct 2023 11:09:06 +0200 Subject: [PATCH] Fix typos and output speedtest result to stdout --- Dockerfile | 2 +- README.md | 5 +++-- src/entrypoint.sh | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b8f66b..c3a444a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.18.4 LABEL maintainer="Michael Oberdorf IT-Consulting " -LABEL site.local.program.version="1.0.1" +LABEL site.local.program.version="1.1.0" ENV MQTT_SERVER=localhost \ MQTT_PORT=1883 \ diff --git a/README.md b/README.md index 51d0ede..fc1e974 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ Source code: [GitHub](https://github.com/cybcon/docker.speedtest2mqtt) # Supported tags and respective `Dockerfile` links -* [`latest`, `1.0.1`](https://github.com/cybcon/docker.speedtest2mqtt/blob/v1.0.1/Dockerfile) +* [`latest`, `1.1.0`](https://github.com/cybcon/docker.speedtest2mqtt/blob/v1.1.0/Dockerfile) +* [`1.0.1`](https://github.com/cybcon/docker.speedtest2mqtt/blob/v1.0.1/Dockerfile) # Summary @@ -52,7 +53,7 @@ services: MQTT_PORT: 1883 MQTT_TOPIC: de/oberdorf-itc/speedtest2mqtt/results FREQUENCE: 300 - secrets: + secrets: - speedtest2mqtt_mqtt_password tmpfs: - /tmp diff --git a/src/entrypoint.sh b/src/entrypoint.sh index d5a5049..f608ea6 100755 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -13,7 +13,7 @@ #----------------------------------------------------------------------------- # Global configuration #----------------------------------------------------------------------------- -VERSION="1.0.1" +VERSION="1.1.0" ERROR_SLEEP_SECONDS=60 CACERT_SYSTEM_PATH='/usr/share/ca-certificates' @@ -233,7 +233,9 @@ do echo "Trigger Speedtest" result=$(do_speedtest) if [ ! -z "${result}" ]; then - echo "Publish speedtest rresult via MQTT" + echo "Speedtest result is:" + echo "${result}" + echo "Publish speedtest result via MQTT" publish_result "${result}" else echo "WARNING: Speedtest without correct json output. Sleep ${ERROR_SLEEP_SECONDS} and try again"