From a08c2712ae6cf626c9c224813bf8ec1d8d6aa6eb Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 22 May 2017 21:53:26 +0800 Subject: [PATCH] update ot-recorder --- ot-recorder/Dockerfile | 2 ++ ot-recorder/README.md | 12 +++++++++--- ot-recorder/arm/Dockerfile | 2 ++ ot-recorder/arm/docker-compose.yml | 10 +++++++--- ot-recorder/arm/docker-entrypoint.sh | 2 +- ot-recorder/docker-compose.yml | 10 +++++++--- ot-recorder/docker-entrypoint.sh | 2 +- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/ot-recorder/Dockerfile b/ot-recorder/Dockerfile index 1de78c4..e6dccfc 100644 --- a/ot-recorder/Dockerfile +++ b/ot-recorder/Dockerfile @@ -17,6 +17,8 @@ RUN set -xe \ 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/# VOLUME $OTR_STORAGEDIR diff --git a/ot-recorder/README.md b/ot-recorder/README.md index 3d92b0c..efc6f97 100644 --- a/ot-recorder/README.md +++ b/ot-recorder/README.md @@ -15,12 +15,18 @@ ot-recorder: - ./data:/var/spool/owntracks/recorder/store environment: - OTR_HOST=iot.eclipse.org - - OTR_PORT=1883 - - OTR_TOPICS=owntracks/username/# - - OTR_OPTIONS=--browser-apikey XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - OTR_PORT=8883 + - OTR_USER=username + - OTR_PASS=password + - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem + - OTR_TOPICS=owntracks/# + - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - OTR_OPTIONS=--qos 0 restart: always ``` +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 diff --git a/ot-recorder/arm/Dockerfile b/ot-recorder/arm/Dockerfile index b730cf3..6367389 100644 --- a/ot-recorder/arm/Dockerfile +++ b/ot-recorder/arm/Dockerfile @@ -17,6 +17,8 @@ RUN set -xe \ 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/# VOLUME $OTR_STORAGEDIR diff --git a/ot-recorder/arm/docker-compose.yml b/ot-recorder/arm/docker-compose.yml index 21d0b23..be4d01f 100644 --- a/ot-recorder/arm/docker-compose.yml +++ b/ot-recorder/arm/docker-compose.yml @@ -6,7 +6,11 @@ ot-recorder: - ./data:/var/spool/owntracks/recorder/store environment: - OTR_HOST=iot.eclipse.org - - OTR_PORT=1883 - - OTR_TOPICS=owntracks/username/# - - OTR_OPTIONS=--browser-apikey XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - OTR_PORT=8883 + - OTR_USER=username + - OTR_PASS=password + - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem + - OTR_TOPICS=owntracks/# + - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - OTR_OPTIONS=--qos 0 restart: always diff --git a/ot-recorder/arm/docker-entrypoint.sh b/ot-recorder/arm/docker-entrypoint.sh index 9b3bf38..f1e6b70 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 0.0.0.0 $OTR_OPTIONS $OTR_TOPICS +exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS diff --git a/ot-recorder/docker-compose.yml b/ot-recorder/docker-compose.yml index 1add65a..0a6a6ad 100644 --- a/ot-recorder/docker-compose.yml +++ b/ot-recorder/docker-compose.yml @@ -6,7 +6,11 @@ ot-recorder: - ./data:/var/spool/owntracks/recorder/store environment: - OTR_HOST=iot.eclipse.org - - OTR_PORT=1883 - - OTR_TOPICS=owntracks/username/# - - OTR_OPTIONS=--browser-apikey XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - OTR_PORT=8883 + - OTR_USER=username + - OTR_PASS=password + - OTR_CAFILE=/etc/ssl/certs/DST_Root_CA_X3.pem + - OTR_TOPICS=owntracks/# + - OTR_BROWSERAPIKEY=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + - OTR_OPTIONS=--qos 0 restart: always diff --git a/ot-recorder/docker-entrypoint.sh b/ot-recorder/docker-entrypoint.sh index 9b3bf38..f1e6b70 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 0.0.0.0 $OTR_OPTIONS $OTR_TOPICS +exec ot-recorder --http-host $OTR_HTTPHOST --http-port $OTR_HTTPPORT $OTR_OPTIONS