Merge pull request #222 from vremenar/master

Simplify docker-compose
2024-03-16 21:05:55 +01:00 · 2024-03-16 19:48:02 +01:00 · 2024-03-16 15:10:40 +01:00 · 2024-03-13 23:39:15 +00:00
4 changed files with 25 additions and 21 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,19 +1,19 @@
-version: "3.6"
 services:
-  pihole_exporter:
-    build:
-      context: ./
-      args:
-        ARCH: CHANGE_ME
-      dockerfile: Dockerfile
-    image: ekofr/pihole-exporter:arm64
-    container_name: pihole_exporter
-    expose:
-      - 9617
-    environment:
-      PIHOLE_HOSTNAME: CHANGE_ME 
-      PIHOLE_PORT: CHANGE_ME
-      PIHOLE_PASSWORD: CHANGE_ME
-      INTERVAL: 30s
-      PORT: 9617
-    restart: always
+  pihole-exporter:
+    container_name: pihole-exporter
+    image: ekofr/pihole-exporter:latest
+    env_file:
+      - pihole-exporter.env
+    ports:
+      - "9617:9617"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "5k"
+        max-file: "5"
+    healthcheck:
+      test: ["CMD", "wget", "--tries=1", "--spider", "http://localhost:9617/metrics"]
+      interval: 300s
+      retries: 5
+      timeout: 10s
+    restart: always
--- a/go.mod
+++ b/go.mod
@ -21,6 +21,6 @@ require (
 	github.com/prometheus/common v0.48.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -225,8 +225,8 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--- a/pihole-exporter.env
+++ b/pihole-exporter.env
@ -0,0 +1,4 @@
+PIHOLE_HOSTNAME=pihole # Chage to PiHole's IP address or FQDN
+PIHOLE_PASSWORD=MyStrongPassword # Change to your PiHole's password
+INTERVAL=90s
+PORT=9617
Author	SHA1	Message	Date
Vincent Composieux	ab365886eb	Merge pull request #222 from vremenar/master Simplify docker-compose	2024-03-16 21:05:55 +01:00
Vladimir Remenar	cb2c02c31a	Simplify docker-compose	2024-03-16 19:48:02 +01:00
Vincent Composieux	46cdb43daa	Merge pull request #221 from eko/dependabot/go_modules/google.golang.org/protobuf-1.33.0 Bump google.golang.org/protobuf from 1.32.0 to 1.33.0	2024-03-16 15:10:40 +01:00
dependabot[bot]	6ce099917a	Bump google.golang.org/protobuf from 1.32.0 to 1.33.0 Bumps google.golang.org/protobuf from 1.32.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2024-03-13 23:39:15 +00:00