Localhost only, take II

README.md

@@ -24,11 +24,7 @@ nodes using Prometheus and presents them in a browser-based Grafana GUI.
 
 By default Prometheus and Grafana will only bind to localhost (127.0.0.1), in
 order to protect you from accidentally exposing them to the public internet. If
-you would like to change this you can use the provided `public.env` file:
-
-```
-docker-compose --env-file public.env up --build
-```
+you would like to change this you must edit the `http_addr` in `grafana.ini`.
 
 ## Maintenance and Contributing
 

docker-compose.yaml

@@ -12,19 +12,15 @@ services:
             - type: bind
               source: ./scrape-targets
               target: /prometheus/targets
-        ports:
-            - ${PROM_LISTEN_ADDRESS}:9090:9090
         restart: always
-        network_mode: bridge
+        network_mode: host
     grafana:
         build:
             context: grafana
         volumes:
             - grafana-data:/var/lib/grafana
-        ports:
-            - ${GRAFANA_LISTEN_ADDRESS}:3000:3000
         restart: always
-        network_mode: bridge
+        network_mode: host
 
 volumes:
     grafana-data:

grafana/grafana.ini

@@ -32,7 +32,7 @@
 ;protocol = http
 
 # The ip address to bind to, empty will bind to all interfaces
-;http_addr =
+http_addr = 127.0.0.1
 
 # The http port  to use
 ;http_port = 3000

prometheus/Dockerfile

@@ -1,2 +1,8 @@
 FROM prom/prometheus
 ADD prometheus.yml /etc/prometheus/
+ENTRYPOINT [ "/bin/prometheus" ]
+CMD        [ "--web.listen-address=127.0.0.1:9090", \
+             "--config.file=/etc/prometheus/prometheus.yml", \
+             "--storage.tsdb.path=/prometheus", \
+             "--web.console.libraries=/usr/share/prometheus/console_libraries", \
+             "--web.console.templates=/usr/share/prometheus/consoles" ]