From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Mon, 26 Dec 2022 02:10:50 +0000 (+0100)
Subject: Various improvements
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=53652d383e63e3d77556efa591724fee8566afd0;p=docker.git

Various improvements
---

diff --git a/code-server/docker-compose.yaml b/code-server/docker-compose.yaml
index d0b8db5..3925296 100644
--- a/code-server/docker-compose.yaml
+++ b/code-server/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   code-server:
     container_name: code-server
-    image: ghcr.io/linuxserver/code-server
+    image: lscr.io/linuxserver/code-server:latest
     restart: unless-stopped
     #ports:
     #  - 8443:8443
@@ -11,12 +11,13 @@ services:
       - TZ=${DOCKER_TZ}
       - PUID=1000
       - PGID=1000
-      #printf 'thisismypassword' | sha256sum | cut -d' ' -f1
-      #- PASSWORD=test
+      #- PASSWORD=password #optional
+      # printf 'thisismypassword' | sha256sum | cut -d' ' -f1
       - HASHED_PASSWORD=5e2f4cae5d297d554b8a1840abd59bab2bfa93254081d733000deefbfb102c15
-      #- SUDO_PASSWORD=password `#optional`
+      #- SUDO_PASSWORD=password #optional
       - SUDO_PASSWORD_HASH=6dcd8d81529b070e3551b7615fc8573e58e9ad7dc7b4a94597ca801bc0e43d27
-      - PROXY_DOMAIN=code.giorgioravera.it
+      - PROXY_DOMAIN=code-server.giorgioravera.it
+      - DEFAULT_WORKSPACE=/config/workspace
     volumes:
       - ${DOCKER_CFG_DIR}/code-server:/config
     networks:
@@ -26,15 +27,15 @@ services:
       # Router: HTTP
       - "traefik.http.routers.code-server.entrypoints=http"
       - "traefik.http.routers.code-server.rule=Host(`code.giorgioravera.it`)"
-      - "traefik.http.routers.code-server.service=code-server"
-      #- "traefik.http.routers.code-server.middlewares=code-server-https-redirect"
+      #- "traefik.http.routers.code-server.service=code-server"
+      - "traefik.http.routers.code-server.middlewares=code-server-https-redirect"
       # Router: HTTPS
       - "traefik.http.routers.code-server-secure.entrypoints=https"
       - "traefik.http.routers.code-server-secure.rule=Host(`code.giorgioravera.it`)"
       - "traefik.http.routers.code-server-secure.tls=true"
       - "traefik.http.routers.code-server-secure.service=code-server"
       # Middlewares: Redirect http to https
-      #- "traefik.http.middlewares.code-server-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.code-server-https-redirect.redirectscheme.scheme=https"
       # Services: Loadbalancer
       - "traefik.http.services.code-server.loadbalancer.server.port=8443"
 
diff --git a/download/jackett.yaml b/download/jackett.yaml
index 3727380..72b748d 100644
--- a/download/jackett.yaml
+++ b/download/jackett.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   jackett:
     container_name: jackett
-    image: linuxserver/jackett:latest
+    image: lscr.io/linuxserver/jackett:latest
     restart: unless-stopped
     #ports:
     #  - 9117:9117
diff --git a/download/radarr.yaml b/download/radarr.yaml
index 7cd7286..a48fbc2 100644
--- a/download/radarr.yaml
+++ b/download/radarr.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   radarr:
     container_name: radarr
-    image: linuxserver/radarr:latest
+    image: lscr.io/linuxserver/radarr:latest
     restart: unless-stopped
     #ports:
     #  - 7878:7878
diff --git a/download/readarr.yaml b/download/readarr.yaml
index 142f1b8..0c0c54b 100644
--- a/download/readarr.yaml
+++ b/download/readarr.yaml
@@ -3,8 +3,7 @@ version: '3'
 services:
   readarr:
     container_name: readarr
-    image: linuxserver/readarr:0.1.0-nightly
-    #image: linuxserver/readarr:latest
+    image: lscr.io/linuxserver/readarr:develop
     restart: unless-stopped
     #ports:
     #  - 8787:8787
diff --git a/download/sonarr.yaml b/download/sonarr.yaml
index e557d32..a0deb96 100644
--- a/download/sonarr.yaml
+++ b/download/sonarr.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   sonarr:
     container_name: sonarr
-    image: linuxserver/sonarr:latest
+    image: lscr.io/linuxserver/sonarr:latest
     restart: unless-stopped
     #ports:
     #  - 8989:8989
diff --git a/download/transmission.yaml b/download/transmission.yaml
index f7f0a2a..fae27cb 100644
--- a/download/transmission.yaml
+++ b/download/transmission.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
   transmission:
     container_name: transmission
-    image: linuxserver/transmission:latest
+    image: lscr.io/linuxserver/transmission:latest
     restart: unless-stopped
     ports:
     #  - 9091:9091
diff --git a/esphome/docker-compose.yaml b/esphome/docker-compose.yaml
index 93ebc4f..fda0f90 100644
--- a/esphome/docker-compose.yaml
+++ b/esphome/docker-compose.yaml
@@ -22,9 +22,9 @@ services:
       # Router: HTTP
       - "traefik.http.routers.esphome.entrypoints=http"
       - "traefik.http.routers.esphome.rule=Host(`home.giorgioravera.it`) && PathPrefix(`/esphome`)"
-      - "traefik.http.routers.esphome.service=esphome"
+      #- "traefik.http.routers.esphome.service=esphome"
       - "traefik.http.routers.esphome.middlewares=esphome-stripprefix"
-      #- "traefik.http.routers.esphome.middlewares=esphome-https-redirect"
+      - "traefik.http.routers.esphome.middlewares=esphome-https-redirect"
       # Router: HTTPS
       - "traefik.http.routers.esphome-secure.entrypoints=https"
       - "traefik.http.routers.esphome-secure.rule=Host(`home.giorgioravera.it`) && PathPrefix(`/esphome`)"
@@ -32,7 +32,7 @@ services:
       - "traefik.http.routers.esphome-secure.service=esphome"
       - "traefik.http.routers.esphome-secure.middlewares=esphome-stripprefix"
       # Middlewares: Redirect http to https
-      #- "traefik.http.middlewares.esphome-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.esphome-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.middlewares.esphome-stripprefix.stripprefix.prefixes=/esphome"
       # Services: Loadbalancer
       - "traefik.http.services.esphome.loadbalancer.server.port=6052"
diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yaml
index 595853d..cef1779 100644
--- a/homeassistant/docker-compose.yaml
+++ b/homeassistant/docker-compose.yaml
@@ -61,9 +61,9 @@ services:
       # Router: HTTP
       - "traefik.http.routers.zigbee2mqtt.entrypoints=http"
       - "traefik.http.routers.zigbee2mqtt.rule=Host(`home.giorgioravera.it`) && PathPrefix(`/zigbee2mqtt`)"
-      - "traefik.http.routers.zigbee2mqtt.service=zigbee2mqtt"
+      #- "traefik.http.routers.zigbee2mqtt.service=zigbee2mqtt"
       - "traefik.http.routers.zigbee2mqtt.middlewares=zigbee2mqtt-stripprefix"
-      #- "traefik.http.routers.zigbee2mqtt.middlewares=zigbee2mqtt-https-redirect"
+      - "traefik.http.routers.zigbee2mqtt.middlewares=zigbee2mqtt-https-redirect"
       # Router: HTTPS
       - "traefik.http.routers.zigbee2mqtt-secure.entrypoints=https"
       - "traefik.http.routers.zigbee2mqtt-secure.rule=Host(`home.giorgioravera.it`) && PathPrefix(`/zigbee2mqtt`)"
@@ -71,7 +71,7 @@ services:
       - "traefik.http.routers.zigbee2mqtt-secure.service=zigbee2mqtt"
       - "traefik.http.routers.zigbee2mqtt-secure.middlewares=zigbee2mqtt-stripprefix"
       # Middlewares: Redirect http to https
-      #- "traefik.http.middlewares.zigbee2mqtt-https-redirect.redirectscheme.scheme=https"
+      - "traefik.http.middlewares.zigbee2mqtt-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.middlewares.zigbee2mqtt-stripprefix.stripprefix.prefixes=/zigbee2mqtt"
       # Services: Loadbalancer
       - "traefik.http.services.zigbee2mqtt.loadbalancer.server.port=8080"
diff --git a/traefik/docker-compose.yaml b/traefik/docker-compose.yaml
index a68873e..c7590d6 100644
--- a/traefik/docker-compose.yaml
+++ b/traefik/docker-compose.yaml
@@ -30,16 +30,20 @@ services:
     network_mode: host
     labels:
       - "traefik.enable=true"
+      # Router: HTTP
       - "traefik.http.routers.traefik.entrypoints=http"
       - "traefik.http.routers.traefik.rule=Host(`traefik.giorgioravera.it`)"
-      - "traefik.http.routers.traefik.service=api@internal"
+      #- "traefik.http.routers.traefik.service=api@internal"
       - "traefik.http.routers.traefik.middlewares=traefik-auth"
-      #- "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
+      - "traefik.http.routers.traefik.middlewares=traefik-https-redirect"
+      # Router: HTTPS
       - "traefik.http.routers.traefik-secure.entrypoints=https"
       - "traefik.http.routers.traefik-secure.rule=Host(`traefik.giorgioravera.it`)"
       - "traefik.http.routers.traefik-secure.tls=true"
       - "traefik.http.routers.traefik-secure.service=api@internal"
       - "traefik.http.routers.traefik-secure.middlewares=traefik-auth"
+      # Middlewares: Redirect http to https
       - "traefik.http.middlewares.traefik-https-redirect.redirectscheme.scheme=https"
       - "traefik.http.middlewares.traefik-auth.basicauth.usersfile=/passwd"
+      # Services: Loadbalancer
       - "traefik.http.services.workaround.loadbalancer.server.port=9999"