diff --git a/covid19/docker-compose.yml.blanked b/covid19/docker-compose.yml.blanked index a404c06..7cbf983 100644 --- a/covid19/docker-compose.yml.blanked +++ b/covid19/docker-compose.yml.blanked @@ -16,14 +16,12 @@ services: build: . depends_on: - mysql - ports: - - "[[HOST_PORT]]:1337" labels: - traefik.http.routers.covidapp.rule=Host(`[[SITE_URL]]`) - traefik.http.routers.covidapp.tls=true - traefik.http.routers.covidapp.tls.certresolver=lets-encrypt - traefik.http.services.covidapp.loadbalancer.server.port=1337 - - traefik.port=[[HOST_PORT]] + - traefik.port=1337 mysql: image: mysql/mysql-server:latest diff --git a/gitea/README.md b/gitea/README.md index 2e8b342..ea8453e 100644 --- a/gitea/README.md +++ b/gitea/README.md @@ -22,7 +22,7 @@ Followed instructions on Gitea page: https://docs.gitea.com/next/installation/in 4. Stop server and set value in app.ini. -Add magic line to /data/persistent/gitea/gitea/gitea/conf/app.ini because local workers will otherwise assume they can use our custom port 3300 to reach services locally. Have to specify local url here. +Add magic line to /data/persistent/gitea/gitea/gitea/conf/app.ini because local workers will otherwise assume they can use our custom port 3330 to reach services locally. Have to specify local url here. This goes in the [server] section. (https://docs.gitea.com/next/administration/config-cheat-sheet) diff --git a/gitea/docker-compose.yml.blanked b/gitea/docker-compose.yml.blanked index fac7886..05cdb31 100644 --- a/gitea/docker-compose.yml.blanked +++ b/gitea/docker-compose.yml.blanked @@ -28,15 +28,12 @@ services: - /data/persistent/gitea/gitea:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro - ports: - - "[[HOST_PORT]]:3000" - - "222:22" labels: - traefik.http.routers.gitea.rule=Host(`[[SITE_URL]]`) - traefik.http.routers.gitea.tls=true - traefik.http.routers.gitea.tls.certresolver=lets-encrypt - - traefik.http.services.gitea.loadbalancer.server.port=[[HOST_PORT]] - - traefik.port=[[HOST_PORT]] + - traefik.http.services.gitea.loadbalancer.server.port=3000 + - traefik.port=3000 database: image: postgres:14 diff --git a/grafana/docker-compose.yml.blanked b/grafana/docker-compose.yml.blanked index 3e0394e..e205bda 100644 --- a/grafana/docker-compose.yml.blanked +++ b/grafana/docker-compose.yml.blanked @@ -21,8 +21,6 @@ services: networks: - grafana-network - traefik_traefik-network - ports: - - "[[HOST_PORT]]:3000" volumes: - ./olomana.ini:/etc/grafana/grafana.ini - /data/coldstorage/grafana_data:/var/lib/grafana @@ -30,8 +28,8 @@ services: - traefik.http.routers.grafana.rule=Host(`[[SITE_URL]]`) - traefik.http.routers.grafana.tls=true - traefik.http.routers.grafana.tls.certresolver=lets-encrypt - - traefik.http.services.grafana.loadbalancer.server.port=[[HOST_PORT]] - - traefik.port=[[HOST_PORT]] + - traefik.http.services.grafana.loadbalancer.server.port=3000 + - traefik.port=3000 depends_on: - node_exporter - prometheus @@ -58,8 +56,6 @@ services: networks: - grafana-network - minecraft_minecraft_network - ports: - - "[[HOST_PORT]]:9090" volumes: - "./prometheus.yml:/etc/prometheus.yml" - prometheus_data:/prometheus diff --git a/jenkins/docker-compose.yml.blanked b/jenkins/docker-compose.yml.blanked index 97f2943..ce723c1 100644 --- a/jenkins/docker-compose.yml.blanked +++ b/jenkins/docker-compose.yml.blanked @@ -13,9 +13,6 @@ services: - traefik_traefik-network privileged: true user: [[USER]] - ports: - - [[HOST_PORT]]:8080 - - 50000:50000 volumes: - /data/coldstorage/jenkins:/var/jenkins_home - /var/run/docker.sock:/var/run/docker.sock @@ -25,5 +22,5 @@ services: - traefik.http.routers.jenkins.tls=true - traefik.http.routers.jenkins.tls.certresolver=lets-encrypt - traefik.http.services.jenkins.loadbalancer.server.port=8080 - - traefik.port=[[HOST_PORT]] + - traefik.port=8080 diff --git a/photoprism/docker-compose.yml.blanked b/photoprism/docker-compose.yml.blanked index ecd9c5e..9daa5e1 100644 --- a/photoprism/docker-compose.yml.blanked +++ b/photoprism/docker-compose.yml.blanked @@ -13,8 +13,6 @@ services: security_opt: - seccomp:unconfined - apparmor:unconfined - ports: - - "[[HOST_PORT]]:2342" volumes: - /data/coldstorage/photoprism/storage:/photoprism/storage - /data/coldstorage/photoprism/originals:/photoprism/originals @@ -37,7 +35,7 @@ services: - traefik.http.routers.private-photos.tls=true - traefik.http.routers.private-photos.tls.certresolver=lets-encrypt - traefik.http.services.private-photos.loadbalancer.server.port=2342 - - traefik.port=[[HOST_PORT]] + - traefik.port=2342 photoprism-public: image: photoprism/photoprism diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index e9fe74d..5ee9352 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -1,16 +1,15 @@ version: "3" networks: - traefik_traefik-network: - external: true + traefik-network: services: traefik: image: traefik:v2.9 container_name: traefik - restart: always + restart: unless-stopped networks: - - traefik_traefik-network + - traefik-network ports: - 80:80 - 8080:8080 @@ -25,7 +24,7 @@ services: image: traefik/whoami container_name: whoami_traefik networks: - - traefik_traefik-network + - traefik-network labels: - traefik.http.routers.whoami.rule=Host(`whoami.whitney.rip`) - traefik.http.routers.whoami.tls=true