From 37988ebda819cdf24374eac96419ea73804e8c49 Mon Sep 17 00:00:00 2001 From: Czechman Date: Wed, 8 Dec 2021 09:33:06 +0000 Subject: [PATCH 1/5] Expose nach Traefik --- docker-compose.photprism.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/docker-compose.photprism.yml b/docker-compose.photprism.yml index 0c46986..31de21e 100644 --- a/docker-compose.photprism.yml +++ b/docker-compose.photprism.yml @@ -30,6 +30,10 @@ version: '3.5' # ------------------------------------------------------------------- # Note: All commands may have to be prefixed with "sudo" when not running as root. # This will change the home directory "~" to "/root" in your configuration. +networks: + photoprism: + traefik: + external: true services: photoprism: @@ -46,7 +50,10 @@ services: - apparmor:unconfined # Run as a specific, non-root user (see https://docs.docker.com/engine/reference/run/#user): user: "1000:1000" - ports: + networks: + - photoprism + - traefik + ports: - "2342:2342" # [server]:[container] environment: PHOTOPRISM_ADMIN_PASSWORD: "g@G4#9Bck8rBD@" # PLEASE CHANGE: Your initial admin password (min 4 characters) @@ -71,7 +78,7 @@ services: PHOTOPRISM_DATABASE_NAME: "photoprism" # MariaDB database schema name PHOTOPRISM_DATABASE_USER: "photoprism" # MariaDB database user name PHOTOPRISM_DATABASE_PASSWORD: "zS&v5bATz2*NCS" # MariaDB database user password - PHOTOPRISM_SITE_URL: "http://localhost:2342/" # Public PhotoPrism URL + PHOTOPRISM_SITE_URL: "https://pm.czechman.dynvpn.de/" # Public PhotoPrism URL PHOTOPRISM_SITE_TITLE: "PhotoPrism" PHOTOPRISM_SITE_CAPTION: "Browse Our Life" PHOTOPRISM_SITE_DESCRIPTION: "" @@ -105,6 +112,18 @@ services: - "/docker/photoprism/data/import:/photoprism/import" # Cache, session, thumbnail, and sidecar files will be created in the *storage* folder (never remove): - "/docker/photoprism/data/storage:/photoprism/storage" + labels: + - "traefik.docker.network=traefik" + - "traefik.enable=true" + - "traefik.backend=photoprism" + - "traefik.passHostHeader=true" + - 'traefik.frontend.rule=Host:pm.czechman.dynvpn.de;PathPrefixStrip: /' + - "traefik.frontend.auth.basic.users=McSeeno:$$2y$$13$$maYBYazCRDGmcKdSy/QA0eWBUEIpobxcUy.z68fnifcpoCqWm18wW" +# - "traefik.frontend.auth.basic.users=McSeeno:$$2y$$13$$maYBYazCRDGmcKdSy/QA0eWBUEIpobxcUy.z68fnifcpoCqWm18wW,gast:$$apr1$$cGUjveuw$$jbRcmTDOfAsqcc9FfsNvG0" + - "traefik.protocol=http" + - "traefik.port=2342" + - "traefik.frontend.auth.forward.trustForwardHeader=true" + - "traefik.frontend.auth.forward.tls.insecureSkipVerify=true" mariadb: restart: unless-stopped From cc1257bdf73337a4d418ce03cf7a63b33ae353ba Mon Sep 17 00:00:00 2001 From: Czechman Date: Wed, 8 Dec 2021 09:38:48 +0000 Subject: [PATCH 2/5] =?UTF-8?q?Einr=C3=BCckung=20korrigiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.photprism.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.photprism.yml b/docker-compose.photprism.yml index 31de21e..a7f24ff 100644 --- a/docker-compose.photprism.yml +++ b/docker-compose.photprism.yml @@ -53,7 +53,7 @@ services: networks: - photoprism - traefik - ports: + ports: - "2342:2342" # [server]:[container] environment: PHOTOPRISM_ADMIN_PASSWORD: "g@G4#9Bck8rBD@" # PLEASE CHANGE: Your initial admin password (min 4 characters) From 14ef9906fd828493de242eb3d88f9e19c1387eb1 Mon Sep 17 00:00:00 2001 From: Czechman Date: Wed, 8 Dec 2021 09:43:06 +0000 Subject: [PATCH 3/5] label https --- docker-compose.photprism.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.photprism.yml b/docker-compose.photprism.yml index a7f24ff..9d62c60 100644 --- a/docker-compose.photprism.yml +++ b/docker-compose.photprism.yml @@ -120,7 +120,7 @@ services: - 'traefik.frontend.rule=Host:pm.czechman.dynvpn.de;PathPrefixStrip: /' - "traefik.frontend.auth.basic.users=McSeeno:$$2y$$13$$maYBYazCRDGmcKdSy/QA0eWBUEIpobxcUy.z68fnifcpoCqWm18wW" # - "traefik.frontend.auth.basic.users=McSeeno:$$2y$$13$$maYBYazCRDGmcKdSy/QA0eWBUEIpobxcUy.z68fnifcpoCqWm18wW,gast:$$apr1$$cGUjveuw$$jbRcmTDOfAsqcc9FfsNvG0" - - "traefik.protocol=http" + - "traefik.protocol=https" - "traefik.port=2342" - "traefik.frontend.auth.forward.trustForwardHeader=true" - "traefik.frontend.auth.forward.tls.insecureSkipVerify=true" From 615b0a8662c0a7eda1a1d026c1d56a36fdb40e6b Mon Sep 17 00:00:00 2001 From: Czechman Date: Wed, 8 Dec 2021 09:50:06 +0000 Subject: [PATCH 4/5] =?UTF-8?q?netzwerk=20an=20mariadb=20geh=C3=A4ngt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.photprism.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.photprism.yml b/docker-compose.photprism.yml index 9d62c60..71e0bd7 100644 --- a/docker-compose.photprism.yml +++ b/docker-compose.photprism.yml @@ -139,6 +139,8 @@ services: MYSQL_DATABASE: photoprism MYSQL_USER: photoprism MYSQL_PASSWORD: zS&v5bATz2*NCS + networks: + - photoprism # Uncomment the following lines to upgrade automatically, whenever there is a new Docker image available: # From 7c4c7f4590defb23342688310b3f47a05d357af1 Mon Sep 17 00:00:00 2001 From: Czechman Date: Wed, 8 Dec 2021 09:51:59 +0000 Subject: [PATCH 5/5] =?UTF-8?q?label=20zur=C3=BCck=20auf=20http=20wegen=20?= =?UTF-8?q?internal=20fehler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.photprism.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.photprism.yml b/docker-compose.photprism.yml index 71e0bd7..47542c7 100644 --- a/docker-compose.photprism.yml +++ b/docker-compose.photprism.yml @@ -120,7 +120,7 @@ services: - 'traefik.frontend.rule=Host:pm.czechman.dynvpn.de;PathPrefixStrip: /' - "traefik.frontend.auth.basic.users=McSeeno:$$2y$$13$$maYBYazCRDGmcKdSy/QA0eWBUEIpobxcUy.z68fnifcpoCqWm18wW" # - "traefik.frontend.auth.basic.users=McSeeno:$$2y$$13$$maYBYazCRDGmcKdSy/QA0eWBUEIpobxcUy.z68fnifcpoCqWm18wW,gast:$$apr1$$cGUjveuw$$jbRcmTDOfAsqcc9FfsNvG0" - - "traefik.protocol=https" + - "traefik.protocol=http" - "traefik.port=2342" - "traefik.frontend.auth.forward.trustForwardHeader=true" - "traefik.frontend.auth.forward.tls.insecureSkipVerify=true"