From 7da6ea3e3966cbe8e99f2f0dcc7674b0f88d238f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 17 Dec 2023 10:35:24 +0800
Subject: [PATCH] update

---
 docker/dockge/docker-compose.yml       | 31 ++++++++++++++++++++++++++
 docker/grafana/.gitignore              |  1 -
 docker/grafana/docker-compose.yml      | 18 +++++++++++----
 docker/grafana/pre-up.sh               |  3 ++-
 docker/homepage/.gitignore             |  1 +
 docker/traefik/conf/apps/dockge.yaml   | 13 +++++++++++
 docker/traefik/conf/apps/homepage.yaml |  2 +-
 7 files changed, 62 insertions(+), 7 deletions(-)
 create mode 100644 docker/dockge/docker-compose.yml
 delete mode 100644 docker/grafana/.gitignore
 create mode 100644 docker/traefik/conf/apps/dockge.yaml

diff --git a/docker/dockge/docker-compose.yml b/docker/dockge/docker-compose.yml
new file mode 100644
index 0000000..0247971
--- /dev/null
+++ b/docker/dockge/docker-compose.yml
@@ -0,0 +1,31 @@
+version: "3.8"
+services:
+  dockge:
+    image: louislam/dockge:1
+    restart: unless-stopped
+      #    ports:
+      # Host Port : Container Port
+      # - 5001:5001
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./data:/app/data
+        
+      # If you want to use private registries, you need to share the auth file with Dockge:
+      # - /root/.docker/:/root/.docker
+
+      # Stacks Directory
+      # ⚠️ READ IT CAREFULLY. If you did it wrong, your data could end up writing into a WRONG PATH.
+      # ⚠️ 1. FULL path only. No relative path (MUST)
+      # ⚠️ 2. Left Stacks Path === Right Stacks Path (MUST)
+      - /root/homeinfra/docker:/root/homeinfra/docker
+    environment:
+      # Tell Dockge where is your stacks directory
+      - DOCKGE_STACKS_DIR=/root/homeinfra/docker
+
+
+    networks:
+      - traefik_default
+
+networks:
+  traefik_default:
+    external: true
diff --git a/docker/grafana/.gitignore b/docker/grafana/.gitignore
deleted file mode 100644
index f897a93..0000000
--- a/docker/grafana/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-grafana.ini
\ No newline at end of file
diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml
index e7c6543..6e74968 100644
--- a/docker/grafana/docker-compose.yml
+++ b/docker/grafana/docker-compose.yml
@@ -1,9 +1,19 @@
 version: "3"
 services:
   grafana:
-    ports:
-      - 3000:3000
+
     container_name: grafana
     image: grafana/grafana-enterprise:10.2.2-boringcrypto
-    volumns:
-      - ./data/grafana.ini:/etc/grafana/grafana.ini
\ No newline at end of file
+    volumes:
+      - ./data/grafana.ini:/etc/grafana/grafana.ini
+    ports:
+      - 127.0.0.1:3000:3000
+    restart: always
+    networks:
+      - traefik_default
+      - net
+
+networks:
+  traefik_default:
+    external: true
+  net:
\ No newline at end of file
diff --git a/docker/grafana/pre-up.sh b/docker/grafana/pre-up.sh
index 22a92d5..5f12153 100644
--- a/docker/grafana/pre-up.sh
+++ b/docker/grafana/pre-up.sh
@@ -1 +1,2 @@
-docker run --rm --entrypoint "cat"  grafana/grafana-enterprise:10.2.2-boringcrypto "/etc/grafana/grafana.ini" > grafana.example.ini
\ No newline at end of file
+mkdir data
+docker run --rm --entrypoint "cat"  grafana/grafana-enterprise:10.2.2-boringcrypto "/etc/grafana/grafana.ini" > data/grafana.ini
diff --git a/docker/homepage/.gitignore b/docker/homepage/.gitignore
index e69de29..2e2e7a3 100644
--- a/docker/homepage/.gitignore
+++ b/docker/homepage/.gitignore
@@ -0,0 +1 @@
+public_html
diff --git a/docker/traefik/conf/apps/dockge.yaml b/docker/traefik/conf/apps/dockge.yaml
new file mode 100644
index 0000000..6ab9666
--- /dev/null
+++ b/docker/traefik/conf/apps/dockge.yaml
@@ -0,0 +1,13 @@
+http:
+  routers:
+    dockge:
+      entrypoints: websecure
+      rule: Host(`dockge.homeinfra.org`)
+      service: dockge
+      tls:
+        certresolver: cloudflare
+  services:
+    dockge:
+      loadbalancer:
+        servers:
+          - url: http://dockge:5001
diff --git a/docker/traefik/conf/apps/homepage.yaml b/docker/traefik/conf/apps/homepage.yaml
index 3cde6a1..d3478f0 100644
--- a/docker/traefik/conf/apps/homepage.yaml
+++ b/docker/traefik/conf/apps/homepage.yaml
@@ -2,7 +2,7 @@ http:
   routers:
     homepage:
       entrypoints: websecure
-      rule: Host(`www.homeinfra.org`)
+      rule: Host(`www.homeinfra.org`) || Host(`homeinfra.org`)
       service: homepage
       tls:
         certresolver: cloudflare