From c15129a87e793cb69a0857ddd52eaafb3c5a6759 Mon Sep 17 00:00:00 2001 From: kev Date: Sat, 1 Apr 2017 14:30:23 +0800 Subject: [PATCH] update ot-recorder --- ot-recorder/Dockerfile | 2 +- ot-recorder/README.md | 8 ++++++++ ot-recorder/arm/Dockerfile | 2 +- ot-recorder/arm/docker-compose.yml | 5 +++++ ot-recorder/arm/docker-entrypoint.sh | 2 +- ot-recorder/docker-compose.yml | 5 +++++ ot-recorder/docker-entrypoint.sh | 2 +- 7 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ot-recorder/Dockerfile b/ot-recorder/Dockerfile index 2bbf792..1de78c4 100644 --- a/ot-recorder/Dockerfile +++ b/ot-recorder/Dockerfile @@ -15,9 +15,9 @@ RUN set -xe \ && rm -rf /var/lib/apt/lists/* ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store -ENV OTR_TOPICS owntracks/# ENV OTR_HOST iot.eclipse.org ENV OTR_PORT 1883 +ENV OTR_TOPICS owntracks/# VOLUME $OTR_STORAGEDIR diff --git a/ot-recorder/README.md b/ot-recorder/README.md index 56fc37e..3d92b0c 100644 --- a/ot-recorder/README.md +++ b/ot-recorder/README.md @@ -13,7 +13,15 @@ ot-recorder: - "8083:8083" volumes: - ./data:/var/spool/owntracks/recorder/store + environment: + - OTR_HOST=iot.eclipse.org + - OTR_PORT=1883 + - OTR_TOPICS=owntracks/username/# + - OTR_OPTIONS=--browser-apikey XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX restart: always ``` +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 diff --git a/ot-recorder/arm/Dockerfile b/ot-recorder/arm/Dockerfile index 71158d6..b730cf3 100644 --- a/ot-recorder/arm/Dockerfile +++ b/ot-recorder/arm/Dockerfile @@ -15,9 +15,9 @@ RUN set -xe \ && rm -rf /var/lib/apt/lists/* ENV OTR_STORAGEDIR /var/spool/owntracks/recorder/store -ENV OTR_TOPICS owntracks/# ENV OTR_HOST iot.eclipse.org ENV OTR_PORT 1883 +ENV OTR_TOPICS owntracks/# VOLUME $OTR_STORAGEDIR diff --git a/ot-recorder/arm/docker-compose.yml b/ot-recorder/arm/docker-compose.yml index 8927e37..21d0b23 100644 --- a/ot-recorder/arm/docker-compose.yml +++ b/ot-recorder/arm/docker-compose.yml @@ -4,4 +4,9 @@ ot-recorder: - "8083:8083" volumes: - ./data:/var/spool/owntracks/recorder/store + environment: + - OTR_HOST=iot.eclipse.org + - OTR_PORT=1883 + - OTR_TOPICS=owntracks/username/# + - OTR_OPTIONS=--browser-apikey XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX restart: always diff --git a/ot-recorder/arm/docker-entrypoint.sh b/ot-recorder/arm/docker-entrypoint.sh index 6ebc8f5..9b3bf38 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_TOPICS +exec ot-recorder --http-host 0.0.0.0 $OTR_OPTIONS $OTR_TOPICS diff --git a/ot-recorder/docker-compose.yml b/ot-recorder/docker-compose.yml index e109507..1add65a 100644 --- a/ot-recorder/docker-compose.yml +++ b/ot-recorder/docker-compose.yml @@ -4,4 +4,9 @@ ot-recorder: - "8083:8083" volumes: - ./data:/var/spool/owntracks/recorder/store + environment: + - OTR_HOST=iot.eclipse.org + - OTR_PORT=1883 + - OTR_TOPICS=owntracks/username/# + - OTR_OPTIONS=--browser-apikey XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX restart: always diff --git a/ot-recorder/docker-entrypoint.sh b/ot-recorder/docker-entrypoint.sh index 6ebc8f5..9b3bf38 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_TOPICS +exec ot-recorder --http-host 0.0.0.0 $OTR_OPTIONS $OTR_TOPICS