From d92b1d56695bdcf15a6f91768b8d79e82146763b Mon Sep 17 00:00:00 2001 From: Benedikt Bauer Date: Sat, 23 Jun 2018 21:08:38 +0200 Subject: [PATCH 1/4] Update docker-compose.yml to use well-maintained packages and the official git repo --- docker-compose.yml | 56 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b2581f6..7bb46c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,27 +1,31 @@ -broker: - image: 'prologic/mosquitto:latest' - ports: - - '1883:1883' -database: - image: 'tutum/mongodb:latest' - environment: - - MONGODB_PASS={{** CHANGE ME **}} +version: "3" +services: + broker: + image: 'eclipse-mosquitto' + ports: + - '1883:1883' + database: + image: 'mongo' + environment: + - 'MONGO_INITDB_ROOT_USERNAME=admin' + - 'MONGO_INITDB_ROOT_PASSWORD=CHANGEME' + ## Uncomment the ports section below to grant direct access to MongoDB + ## Before 2014 this was the common way to upload data to NightScout + ## In Summer 2014 it was deprecated in favor of the new REST API + # ports: + # - '27017:27017' -# Uncomment if you want to expose the MongoDB port directly -# If you're using the API interface (highly recommended) then you can -# safely leave this commented out -# ports: -# - '27017:27017' - -nightscout: - image: 'nightscout/cgm-remote-monitor-development:latest' - environment: - - API_SECRET={{** CHANGE ME **}} - - 'MONGO_CONNECTION=mongodb://admin:{{** CHANGE ME **}}@database/admin' - - 'MQTT_MONITOR=mqtt://{{** CHANGE ME **}}@broker' - - PORT=1337 - links: - - broker - - database - ports: - - '1337:1337' + nightscout: + build: + context: https://github.com/nightscout/cgm-remote-monitor.git + dockerfile: Dockerfile.example + environment: + - 'API_SECRET=CHANGEME_PLEASE' + - 'MONGO_CONNECTION=mongodb://admin:CHANGEME@database/admin' + - 'MQTT_MONITOR=mqtt://CHANGEME@broker' + - 'PORT=1337' + links: + - broker + - database + ports: + - '1337:1337' From 60029e2a1d730657df279b42bbe5944b2e80e65f Mon Sep 17 00:00:00 2001 From: Benedikt Bauer Date: Sat, 23 Jun 2018 21:08:38 +0200 Subject: [PATCH 2/4] Update docker-compose.yml to use well-maintained packages and the official git repo --- docker-compose.yml | 56 +++++++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b2581f6..7bb46c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,27 +1,31 @@ -broker: - image: 'prologic/mosquitto:latest' - ports: - - '1883:1883' -database: - image: 'tutum/mongodb:latest' - environment: - - MONGODB_PASS={{** CHANGE ME **}} +version: "3" +services: + broker: + image: 'eclipse-mosquitto' + ports: + - '1883:1883' + database: + image: 'mongo' + environment: + - 'MONGO_INITDB_ROOT_USERNAME=admin' + - 'MONGO_INITDB_ROOT_PASSWORD=CHANGEME' + ## Uncomment the ports section below to grant direct access to MongoDB + ## Before 2014 this was the common way to upload data to NightScout + ## In Summer 2014 it was deprecated in favor of the new REST API + # ports: + # - '27017:27017' -# Uncomment if you want to expose the MongoDB port directly -# If you're using the API interface (highly recommended) then you can -# safely leave this commented out -# ports: -# - '27017:27017' - -nightscout: - image: 'nightscout/cgm-remote-monitor-development:latest' - environment: - - API_SECRET={{** CHANGE ME **}} - - 'MONGO_CONNECTION=mongodb://admin:{{** CHANGE ME **}}@database/admin' - - 'MQTT_MONITOR=mqtt://{{** CHANGE ME **}}@broker' - - PORT=1337 - links: - - broker - - database - ports: - - '1337:1337' + nightscout: + build: + context: https://github.com/nightscout/cgm-remote-monitor.git + dockerfile: Dockerfile.example + environment: + - 'API_SECRET=CHANGEME_PLEASE' + - 'MONGO_CONNECTION=mongodb://admin:CHANGEME@database/admin' + - 'MQTT_MONITOR=mqtt://CHANGEME@broker' + - 'PORT=1337' + links: + - broker + - database + ports: + - '1337:1337' From 32afc9cd50659a645c42a4413d382c93cd9dae55 Mon Sep 17 00:00:00 2001 From: Benedikt Bauer Date: Sat, 23 Jun 2018 21:59:53 +0200 Subject: [PATCH 3/4] change links to depends_on as links is deprecated and hostnames are published by default --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7bb46c9..234a053 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: - 'MONGO_CONNECTION=mongodb://admin:CHANGEME@database/admin' - 'MQTT_MONITOR=mqtt://CHANGEME@broker' - 'PORT=1337' - links: + depends_on: - broker - database ports: From d872268a557219cf90bdf2fe833a07f9774cbf99 Mon Sep 17 00:00:00 2001 From: Benedikt Bauer Date: Wed, 6 Dec 2023 07:48:55 +0100 Subject: [PATCH 4/4] Update docker-compose.yml Nightscout changed their dockerfile name, yay --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 234a053..1cd8b84 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: nightscout: build: context: https://github.com/nightscout/cgm-remote-monitor.git - dockerfile: Dockerfile.example + dockerfile: Dockerfile environment: - 'API_SECRET=CHANGEME_PLEASE' - 'MONGO_CONNECTION=mongodb://admin:CHANGEME@database/admin'