From ba886ff2bc51088b8f05f285ed436e4617cd3290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20=C5=BBbikowski?= Date: Mon, 24 Nov 2025 00:01:50 +0100 Subject: [PATCH] Update compose.yaml --- compose.yaml | 81 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 14 deletions(-) diff --git a/compose.yaml b/compose.yaml index 32569fc..03625e0 100644 --- a/compose.yaml +++ b/compose.yaml @@ -5,7 +5,7 @@ services: - .env restart: unless-stopped networks: - - caddy + - proxy - wings0 ports: - "2022:2022" @@ -23,23 +23,73 @@ services: - "${DATA_DIR}/lib:/var/lib/pterodactyl/" - "${VOLUMES_DIR}:${VOLUMES_DIR}" labels: - caddy: "${DOMAIN}" - caddy.reverse_proxy: "{{upstreams 443}}" - caddy.tls: ${MAIL} + - "traefik.enable=true" + - "traefik.docker.network=wings_proxy" + - "traefik.http.routers.wings.rule=Host(`${DOMAIN}`)" + - "traefik.http.routers.wings.priority=1" + - "traefik.http.routers.wings.entrypoints=websecure" + - "traefik.http.routers.wings.tls.certresolver=http" + - "traefik.http.services.wings.loadbalancer.server.port=443" - caddy: - image: caddy:latest + traefik: + image: traefik:latest restart: unless-stopped - networks: - - caddy - env_file: - - .env + command: + # - "--api.insecure=true" # jeśli chcesz włączyć panel sterowania Traefikiem --- IGNORE --- + - "--providers.docker=true" + - "--entrypoints.web.address=:80" + - "--entrypoints.websecure.address=:443" + - "--certificatesresolvers.http.acme.httpchallenge.entrypoint=web" + - "--certificatesresolvers.http.acme.email=${TRAEFIK_EMAIL}" + - "--certificatesresolvers.http.acme.storage=/letsencrypt/acme.json" + - "--log.level=INFO" + - "--entrypoints.web.http.redirections.entrypoint.to=websecure" + - "--entrypoints.web.http.redirections.entrypoint.scheme=https" + - "--providers.docker.exposedbydefault=false" + - "--metrics.prometheus=true" + - "--metrics.prometheus.addrouterslabels=true" ports: - "80:80" - "443:443" + # - "8080:8080" # jeśli chcesz włączyć panel sterowania Traefikiem --- IGNORE --- + networks: + - proxy + - monitoring volumes: - - ${CADDY_DIR}/data:/data - - ${CADDY_DIR}/config:/config + - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "${TRAEFIK_DIR}/letsencrypt:/letsencrypt" + + cadvisor: + image: gcr.io/cadvisor/cadvisor:latest + container_name: cadvisor + restart: unless-stopped + # ports: + # - "8080:8080" # odkomentuj, jeśli chcesz mieć dostęp do interfejsu webowego cAdvisor + volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "/:/rootfs:ro" + - "/var/run:/var/run:ro" + - "/sys:/sys:ro" + - "/var/lib/docker/:/var/lib/docker:ro" + - "/cgroup:/cgroup:ro" + - "/dev:/dev:ro" + - "/etc/machine-id:/etc/machine-id:ro" + networks: + - monitoring + + prometheus: + image: prom/prometheus:latest + container_name: prometheus + restart: unless-stopped + volumes: + - ${PROMETHEUS_DIR}/prometheus.yml:/etc/prometheus/prometheus.yml + ports: + - "9090:9090" + networks: + - monitoring + - proxy + + networks: wings0: @@ -51,5 +101,8 @@ networks: driver_opts: com.docker.network.bridge.name: wings0 - caddy: - external: false \ No newline at end of file + proxy: + external: false + + monitoring: + external: false