diff --git a/docker-compose.yml b/docker-compose.yml index 148cb97..22c5a5d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,11 +32,15 @@ services: image: caddy container_name: caddy ports: + - "80:80" + - "443:443" + - "443:443/udp" - "${TIMETRACKER_EXTERNAL_PORT}:${TIMETRACKER_INTERNAL_PORT}" - "${DENDRON_NOTES_EXTERNAL_PORT}:${DENDRON_NOTES_INTERNAL_PORT}" user: ${PUID} volumes: - "${DOCKER_STORAGE_PATH}/caddy/config:/etc/caddy/" + - caddy_data:/data - "/www/notes:/srv/notes" - "timetracker-static:/srv/timetracker" networks: @@ -615,28 +619,6 @@ services: - base restart: unless-stopped - npm: - container_name: nginx-proxy-manager - image: docker.io/jc21/nginx-proxy-manager:2.9.22 - 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" - - "${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 @@ -748,4 +730,5 @@ networks: attachable: true volumes: - timetracker-static: \ No newline at end of file + timetracker-static: + caddy_data: \ No newline at end of file