From e575ce70b571ff3d8eece84991e36a596c7d1598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Kucharczyk?= Date: Fri, 1 Dec 2023 19:05:30 +0100 Subject: [PATCH] switch from npm to caddy --- docker-compose.yml | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 887e059..69464f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,6 +34,8 @@ services: ports: - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}" - "${DENDRON_NOTES_EXTERNAL_PORT}:${DENDRON_NOTES_INTERNAL_PORT}" + - 80:80 + - 443:443 user: ${PUID} volumes: - "${DOCKER_STORAGE_PATH}/caddy/etc:/etc/caddy" @@ -560,29 +562,6 @@ services: - base restart: unless-stopped - npm: - container_name: nginx-proxy-manager - image: docker.io/jc21/nginx-proxy-manager:latest - network_mode: host - # doesn't need to be in the mariadb network because it uses host mode - depends_on: - - mariadb - volumes: - - "${DOCKER_STORAGE_PATH}/nginx-proxy-manager/data:/data" - - "${DOCKER_STORAGE_PATH}/nginx-proxy-manager/letsencrypt:/etc/letsencrypt" - - sockets:/var/run/mysqld - - "${DOCKER_STORAGE_PATH}/nginx-proxy-manager/98-themepark:/etc/cont-init.d/99-themepark" - environment: - - DB_MYSQL_HOST=localhost - - DB_MYSQL_NAME=npm - - DB_MYSQL_PASSWORD=npm - - "DB_MYSQL_PORT=${MARIADB_EXTERNAL_PORT}" - - DB_MYSQL_USER=npm - profiles: - - infra - - base - restart: unless-stopped - photoprism: container_name: photoprism image: docker.io/photoprism/photoprism