Pihole update

config/dynamic_conf.yaml

@@ -1 +1 @@
-http: {}
+http: {}

home_assistant/docker-compose.yml

@@ -1,26 +1,26 @@
-version: '3'
+version: '3'
-
+
-services:
+services:
-    home_assistant:
+    home_assistant:
-        image: homeassistant/home-assistant
+        image: homeassistant/home-assistant
-        restart: always
+        restart: always
-        container_name: home_assistant
+        container_name: home_assistant
-        environment:
+        environment:
-            - TZ=Europe/Paris
+            - TZ=Europe/Paris
-        volumes:
+        volumes:
-            - home_assistant_config:/config
+            - home_assistant_config:/config
-            - /etc/localtime:/etc/localtime:ro
+            - /etc/localtime:/etc/localtime:ro
-        network_mode: host
+        network_mode: host
-        expose:
+        expose:
-            - 8123
+            - 8123
-        labels:
+        labels:
-            - "traefik.enable=true"
+            - "traefik.enable=true"
-            - "traefik.http.routers.homeassistant-secure.entrypoints=https"ø
+            - "traefik.http.routers.homeassistant-secure.entrypoints=https"
-            - "traefik.http.routers.homeassistant-secure.rule=Host(`domo.mrdev023.fr`)"
+            - "traefik.http.routers.homeassistant-secure.rule=Host(`domo.mrdev023.fr`)"
-            - "traefik.http.routers.homeassistant-secure.tls=true"
+            - "traefik.http.routers.homeassistant-secure.tls=true"
-            - "traefik.http.routers.homeassistant-secure.tls.certresolver=sslResolver"
+            - "traefik.http.routers.homeassistant-secure.tls.certresolver=sslResolver"
-            # - "traefik.http.routers.homeassistant-secure.service=homeassistant"
+            # - "traefik.http.routers.homeassistant-secure.service=homeassistant"
-            - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
+            - "traefik.http.services.homeassistant.loadbalancer.server.port=8123"
-
+
-volumes:
+volumes:
-    home_assistant_config:
+    home_assistant_config:

outline/docker-compose.yml

@@ -0,0 +1,72 @@
+version: "3"
+services:
+
+  outline:
+    image: outlinewiki/outline
+    env_file: ./docker.env
+    depends_on:
+      - postgres
+      - redis
+      - storage
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.outline-secure.entrypoints=https"
+      - "traefik.http.routers.outline-secure.rule=Host(`outline.mrdev023.fr`)"
+      - "traefik.http.routers.outline-secure.tls=true"
+      - "traefik.http.routers.outline-secure.tls.certresolver=sslResolver"
+      - "traefik.http.services.whoami.loadbalancer.server.port=3000"
+      - "traefik.docker.network=proxy"
+
+  redis:
+    image: redis
+    env_file: ./docker.env
+    volumes:
+      - ./redis.conf:/redis.conf
+    command: ["redis-server", "/redis.conf"]
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 30s
+      retries: 3
+
+  postgres:
+    image: postgres
+    env_file: ./docker.env
+    volumes:
+      - database-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+    environment:
+      POSTGRES_USER: 'user'
+      POSTGRES_PASSWORD: 'pass'
+      POSTGRES_DB: 'outline'
+
+  storage:
+    image: minio/minio
+    env_file: ./docker.env
+    entrypoint: sh
+    command: -c 'minio server'
+    deploy:
+      restart_policy:
+        condition: on-failure
+    volumes:
+      - storage-data:/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
+      interval: 30s
+      timeout: 20s
+      retries: 3
+
+volumes:
+  https-portal-data:
+  storage-data:
+  database-data:
+networks:
+  proxy:
+    external: true
+

pihole/etc-pihole/list.1.raw.githubusercontent.com.domains.sha1

@@ -1 +1 @@
-d49d3d16bdf769beac4cc5e82ed05ca0ef7d76a6  /etc/pihole/list.1.raw.githubusercontent.com.domains
+ff54f3730e1efafd13cb49a132e3c41f4b2f7437  /etc/pihole/list.1.raw.githubusercontent.com.domains

pihole/etc-pihole/versions

@@ -6,6 +6,6 @@ WEB_VERSION=v5.16-0-gc2afe42
 FTL_VERSION=v5.18.2
 DOCKER_VERSION=2022.10
 GITHUB_CORE_VERSION=v5.14.2
-GITHUB_WEB_VERSION=v5.17
+GITHUB_WEB_VERSION=v5.18
-GITHUB_FTL_VERSION=v5.19.2
+GITHUB_FTL_VERSION=v5.20
-GITHUB_DOCKER_VERSION=2022.11.2
+GITHUB_DOCKER_VERSION=2022.12.1