From fe5a5984c30de70bfa7c4ec933ea522d8218c7b3 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 27 Jun 2020 17:45:28 +0100 Subject: [PATCH] Remove container names from containers They're not needed for anything, and caused annoying weird issues when cycling containers --- ansible/roles/duplicati/files/docker-compose.yml | 1 - ansible/roles/home-assistant/files/docker-compose.yml | 1 - ansible/roles/intersect-docker/files/calibre/docker-compose.yml | 1 - .../intersect-docker/files/folding-at-home/docker-compose.yml | 2 -- ansible/roles/intersect-docker/files/gitea/docker-compose.yml | 1 - ansible/roles/intersect-docker/files/gotify/docker-compose.yml | 1 - .../roles/intersect-docker/files/jellyfin/docker-compose.yml | 1 - .../roles/intersect-docker/files/librespeed/docker-compose.yml | 1 - .../roles/intersect-docker/files/nextcloud/docker-compose.yml | 2 -- ansible/roles/intersect-docker/files/quassel/docker-compose.yml | 1 - .../intersect-docker/files/todoist-github/docker-compose.yml | 1 - ansible/roles/intersect-docker/files/torrent/docker-compose.yml | 1 - ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml | 1 - .../roles/intersect-docker/files/wallabag/docker-compose.yml | 1 - ansible/roles/intersect-docker/files/web-rng/docker-compose.yml | 1 - ansible/roles/intersect-docker/files/whoami/docker-compose.yml | 1 - ansible/roles/netdata/files/docker-compose.yml | 1 - ansible/roles/socks-proxy/files/docker-compose.yml | 1 - ansible/roles/statping/files/docker-compose.yml | 1 - ansible/roles/traefik/files/docker-compose.yml | 1 - ansible/roles/website/files/docker-compose.yml | 1 - 21 files changed, 23 deletions(-) diff --git a/ansible/roles/duplicati/files/docker-compose.yml b/ansible/roles/duplicati/files/docker-compose.yml index 6d70933..bf9c0dc 100644 --- a/ansible/roles/duplicati/files/docker-compose.yml +++ b/ansible/roles/duplicati/files/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: duplicati: image: linuxserver/duplicati:v2.0.5.1-2.0.5.1_beta_2020-01-18-ls61 - container_name: duplicati hostname: "{{ ansible_fqdn }}" environment: - PUID={{ docker_user.id }} diff --git a/ansible/roles/home-assistant/files/docker-compose.yml b/ansible/roles/home-assistant/files/docker-compose.yml index 9b94a98..39d6986 100644 --- a/ansible/roles/home-assistant/files/docker-compose.yml +++ b/ansible/roles/home-assistant/files/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: homeassistant: image: homeassistant/home-assistant:stable - container_name: home-assistant network_mode: host volumes: - ./config:/config diff --git a/ansible/roles/intersect-docker/files/calibre/docker-compose.yml b/ansible/roles/intersect-docker/files/calibre/docker-compose.yml index 7292cf2..ca6cee2 100644 --- a/ansible/roles/intersect-docker/files/calibre/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/calibre/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: calibre: image: linuxserver/calibre-web:latest - container_name: calibre environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/folding-at-home/docker-compose.yml b/ansible/roles/intersect-docker/files/folding-at-home/docker-compose.yml index 421eeb0..2d1cad9 100644 --- a/ansible/roles/intersect-docker/files/folding-at-home/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/folding-at-home/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: folding-at-home: image: linuxserver/foldingathome:latest - container_name: folding-at-home cpus: 0.75 environment: - TZ=Europe/London @@ -13,5 +12,4 @@ services: - ./config:/config ports: - 7396:7396 - - 36330:36330 restart: unless-stopped diff --git a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml index 080414f..58959ef 100644 --- a/ansible/roles/intersect-docker/files/gitea/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/gitea/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: gitea: image: gitea/gitea:1.12.1 - container_name: gitea restart: unless-stopped environment: - USER_UID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/gotify/docker-compose.yml b/ansible/roles/intersect-docker/files/gotify/docker-compose.yml index 956300d..8497ec8 100644 --- a/ansible/roles/intersect-docker/files/gotify/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/gotify/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: duplicati: image: gotify/server:2.0.16 - container_name: gotify environment: - TZ=Europe/London volumes: diff --git a/ansible/roles/intersect-docker/files/jellyfin/docker-compose.yml b/ansible/roles/intersect-docker/files/jellyfin/docker-compose.yml index b847246..913087e 100644 --- a/ansible/roles/intersect-docker/files/jellyfin/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/jellyfin/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: jellyfin: image: linuxserver/jellyfin:v10.5.5-ls58 - container_name: jellyfin environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/librespeed/docker-compose.yml b/ansible/roles/intersect-docker/files/librespeed/docker-compose.yml index 38a2227..234d076 100644 --- a/ansible/roles/intersect-docker/files/librespeed/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/librespeed/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: librespeed: image: linuxserver/librespeed:latest - container_name: librespeed environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml index c4a5eb6..548412a 100644 --- a/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/nextcloud/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: nextcloud: image: linuxserver/nextcloud:19.0.0-ls87 - container_name: nextcloud environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} @@ -62,7 +61,6 @@ services: collabora: image: collabora/code:latest - container_name: collabora restart: unless-stopped cap_add: - MKNOD diff --git a/ansible/roles/intersect-docker/files/quassel/docker-compose.yml b/ansible/roles/intersect-docker/files/quassel/docker-compose.yml index 28b685e..7e374b8 100644 --- a/ansible/roles/intersect-docker/files/quassel/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/quassel/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: quassel-core: image: linuxserver/quassel-core:latest - container_name: quassel environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/todoist-github/docker-compose.yml b/ansible/roles/intersect-docker/files/todoist-github/docker-compose.yml index a402799..611b4a6 100644 --- a/ansible/roles/intersect-docker/files/todoist-github/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/todoist-github/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: todoist-github: image: theorangeone/todoist-github:latest - container_name: todoist-github restart: unless-stopped command: python3 -m todoist_github --interval 900 environment: diff --git a/ansible/roles/intersect-docker/files/torrent/docker-compose.yml b/ansible/roles/intersect-docker/files/torrent/docker-compose.yml index 2ad10bc..cabd935 100644 --- a/ansible/roles/intersect-docker/files/torrent/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/torrent/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: deluge: image: linuxserver/deluge:latest - container_name: deluge environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml b/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml index fcae792..bc0fd52 100644 --- a/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/tt-rss/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: tt-rss: image: lunik1/tt-rss:latest - container_name: tt-rss environment: - PUID={{ docker_user.id }} - PGID={{ docker_user.id }} diff --git a/ansible/roles/intersect-docker/files/wallabag/docker-compose.yml b/ansible/roles/intersect-docker/files/wallabag/docker-compose.yml index 2437d5c..f15cbec 100644 --- a/ansible/roles/intersect-docker/files/wallabag/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/wallabag/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: wallabag: image: wallabag/wallabag:latest - container_name: wallabag restart: unless-stopped environment: - SYMFONY__ENV__SECRET={{ wallabag_secret }} diff --git a/ansible/roles/intersect-docker/files/web-rng/docker-compose.yml b/ansible/roles/intersect-docker/files/web-rng/docker-compose.yml index 70c1bf8..0f3fe80 100644 --- a/ansible/roles/intersect-docker/files/web-rng/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/web-rng/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: web-rng: image: docker.pkg.github.com/realorangeone/web-rng/web-rng:latest - container_name: web-rng restart: unless-stopped labels: - traefik.enable=true diff --git a/ansible/roles/intersect-docker/files/whoami/docker-compose.yml b/ansible/roles/intersect-docker/files/whoami/docker-compose.yml index 4a8d94d..03d325e 100644 --- a/ansible/roles/intersect-docker/files/whoami/docker-compose.yml +++ b/ansible/roles/intersect-docker/files/whoami/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: whoami: image: containous/whoami:latest - container_name: whoami restart: unless-stopped labels: - traefik.enable=true diff --git a/ansible/roles/netdata/files/docker-compose.yml b/ansible/roles/netdata/files/docker-compose.yml index 6a5613e..4fc4475 100644 --- a/ansible/roles/netdata/files/docker-compose.yml +++ b/ansible/roles/netdata/files/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: netdata: image: netdata/netdata:latest - container_name: netdata cap_add: - SYS_PTRACE security_opt: diff --git a/ansible/roles/socks-proxy/files/docker-compose.yml b/ansible/roles/socks-proxy/files/docker-compose.yml index b6dfdc6..8bc9e19 100644 --- a/ansible/roles/socks-proxy/files/docker-compose.yml +++ b/ansible/roles/socks-proxy/files/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: 3proxy: image: riftbit/3proxy:latest - container_name: 3proxy restart: unless-stopped ports: - 1080:1080 diff --git a/ansible/roles/statping/files/docker-compose.yml b/ansible/roles/statping/files/docker-compose.yml index 04bc85e..df9772b 100644 --- a/ansible/roles/statping/files/docker-compose.yml +++ b/ansible/roles/statping/files/docker-compose.yml @@ -3,7 +3,6 @@ version: "2.3" services: statping: image: hunterlong/statping:v0.80.70 - container_name: statping restart: unless-stopped volumes: - ./statping:/app diff --git a/ansible/roles/traefik/files/docker-compose.yml b/ansible/roles/traefik/files/docker-compose.yml index a3716ec..b263d64 100644 --- a/ansible/roles/traefik/files/docker-compose.yml +++ b/ansible/roles/traefik/files/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: traefik: - container_name: traefik image: traefik:v2.2.1 network_mode: host volumes: diff --git a/ansible/roles/website/files/docker-compose.yml b/ansible/roles/website/files/docker-compose.yml index 1bf1a79..aa973ec 100644 --- a/ansible/roles/website/files/docker-compose.yml +++ b/ansible/roles/website/files/docker-compose.yml @@ -2,7 +2,6 @@ version: "2.3" services: website: image: docker.pkg.github.com/realorangeone/theorangeone.net/theorangeone.net:latest - container_name: theorangeone.net environment: - TZ=Europe/London restart: unless-stopped