From b51bfef97401b2ccbe7d78081086b03ac95a5abb Mon Sep 17 00:00:00 2001 From: kev Date: Tue, 1 Oct 2019 22:47:40 +0800 Subject: [PATCH] update ot-recorder --- ot-recorder/Dockerfile | 2 +- ot-recorder/README.md | 2 ++ ot-recorder/arm/Dockerfile | 2 +- ot-recorder/arm/docker-compose.yml | 2 +- ot-recorder/arm/docker-entrypoint.sh | 2 +- ot-recorder/docker-compose.yml | 2 +- ot-recorder/docker-entrypoint.sh | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ot-recorder/Dockerfile b/ot-recorder/Dockerfile index 708a0e3..b648b01 100644 --- a/ot-recorder/Dockerfile +++ b/ot-recorder/Dockerfile @@ -14,12 +14,12 @@ RUN set -xe \ && apt-get install -y ot-recorder \ && rm -rf /var/lib/apt/lists/* -ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store ENV OTR_HOST iot.eclipse.org ENV OTR_PORT 1883 ENV OTR_HTTPHOST 0.0.0.0 ENV OTR_HTTPPORT 8083 ENV OTR_TOPICS owntracks/# +ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store VOLUME $OTR_STORAGEDIR diff --git a/ot-recorder/README.md b/ot-recorder/README.md index efc6f97..a3f37fe 100644 --- a/ot-recorder/README.md +++ b/ot-recorder/README.md @@ -25,9 +25,11 @@ ot-recorder: restart: always ``` +:warning: Some variables don't work (`OTR_QOS`) as [document][3] said. You can pass any options to process via `OTR_OPTIONS` environment variable. Click [this][2] to generate a google map api key. [1]: https://github.com/owntracks/recorder [2]: https://developers.google.com/maps/documentation/javascript/?authuser=1 +[3]: https://github.com/owntracks/recorder#configuration-file diff --git a/ot-recorder/arm/Dockerfile b/ot-recorder/arm/Dockerfile index c219f04..69a3b6c 100644 --- a/ot-recorder/arm/Dockerfile +++ b/ot-recorder/arm/Dockerfile @@ -14,12 +14,12 @@ RUN set -xe \ && apt-get install -y ot-recorder \ && rm -rf /var/lib/apt/lists/* -ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store ENV OTR_HOST iot.eclipse.org ENV OTR_PORT 1883 ENV OTR_HTTPHOST 0.0.0.0 ENV OTR_HTTPPORT 8083 ENV OTR_TOPICS owntracks/# +ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store VOLUME $OTR_STORAGEDIR diff --git a/ot-recorder/arm/docker-compose.yml b/ot-recorder/arm/docker-compose.yml index be4d01f..eb0034f 100644 --- a/ot-recorder/arm/docker-compose.yml +++ b/ot-recorder/arm/docker-compose.yml @@ -12,5 +12,5 @@ ot-recorder: - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem - OTR_TOPICS=owntracks/# - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - OTR_OPTIONS=--qos 0 + # OTR_OPTIONS=--debug restart: always diff --git a/ot-recorder/arm/docker-entrypoint.sh b/ot-recorder/arm/docker-entrypoint.sh index f1e6b70..e75ff3b 100755 --- a/ot-recorder/arm/docker-entrypoint.sh +++ b/ot-recorder/arm/docker-entrypoint.sh @@ -10,4 +10,4 @@ then ot-recorder --initialize fi -exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS +exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#} diff --git a/ot-recorder/docker-compose.yml b/ot-recorder/docker-compose.yml index 0a6a6ad..e7cc324 100644 --- a/ot-recorder/docker-compose.yml +++ b/ot-recorder/docker-compose.yml @@ -12,5 +12,5 @@ ot-recorder: - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem - OTR_TOPICS=owntracks/# - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - - OTR_OPTIONS=--qos 0 + # OTR_OPTIONS=--debug restart: always diff --git a/ot-recorder/docker-entrypoint.sh b/ot-recorder/docker-entrypoint.sh index f1e6b70..e75ff3b 100755 --- a/ot-recorder/docker-entrypoint.sh +++ b/ot-recorder/docker-entrypoint.sh @@ -10,4 +10,4 @@ then ot-recorder --initialize fi -exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS +exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS ${OTR_TOPICS:-owntracks/#}