fix: moved tailclient container service, modified to have proper nesting for 'depends_on' attr
This commit is contained in:
+31
-31
@@ -65,36 +65,6 @@ services:
|
|||||||
glance.icon: "si:wireguard"
|
glance.icon: "si:wireguard"
|
||||||
glance.description: VPN client connection
|
glance.description: VPN client connection
|
||||||
|
|
||||||
# @NOTE https://tailscale.com/docs/features/containers/docker
|
|
||||||
# @NOTE https://tailscale.com/blog/docker-tailscale-guide
|
|
||||||
tailclient:
|
|
||||||
image: tailscale/tailscale:latest
|
|
||||||
container_name: tailclient
|
|
||||||
cap_add:
|
|
||||||
- SYS_MODULE
|
|
||||||
- NET_ADMIN
|
|
||||||
restart: unless-stopped
|
|
||||||
devices:
|
|
||||||
- /dev/net/tun:/dev/net/tun
|
|
||||||
volumes:
|
|
||||||
- /etc/localtime:/etc/localtime:ro
|
|
||||||
- /lib/modules:/lib/modules:ro
|
|
||||||
- "tailscale-lib:/var/lib/tailscale"
|
|
||||||
- ~/.config/tailscale:/config:Z
|
|
||||||
networks:
|
|
||||||
- hs
|
|
||||||
hostname: tailnet
|
|
||||||
env_file:
|
|
||||||
- ${HOME}/.all.env
|
|
||||||
# - ${HOME}/.tailscale.env
|
|
||||||
environment:
|
|
||||||
TS_AUTHKEY_FILE: /run/secrets/headscale.key
|
|
||||||
TS_SERVE_CONFIG: /config/conf.json
|
|
||||||
TS_EXTRA_ARGS: "--advertise-tags=tag:container"
|
|
||||||
TS_STATE_DIR: /var/lib/tailscale
|
|
||||||
secrets:
|
|
||||||
- headscale.key
|
|
||||||
|
|
||||||
# @TODO make subsequent containers have 'network_mode' attrbute set to value 'service:wgclient'/'service:tailclient'
|
# @TODO make subsequent containers have 'network_mode' attrbute set to value 'service:wgclient'/'service:tailclient'
|
||||||
# OR make subsequent containers have 'networks' attribute set to list value with 'container:wgclient'/'contaner:tailclient' item
|
# OR make subsequent containers have 'networks' attribute set to list value with 'container:wgclient'/'contaner:tailclient' item
|
||||||
|
|
||||||
@@ -338,7 +308,7 @@ services:
|
|||||||
OG_CUSTOM_FAVICON: ${OG_FAVICON:-logo.ico}
|
OG_CUSTOM_FAVICON: ${OG_FAVICON:-logo.ico}
|
||||||
secrets:
|
secrets:
|
||||||
- "user-mysql.pass"
|
- "user-mysql.pass"
|
||||||
# - opengist.secret
|
- opengist.secret
|
||||||
labels:
|
labels:
|
||||||
glance.name: OpenGist
|
glance.name: OpenGist
|
||||||
glance.id: opengist
|
glance.id: opengist
|
||||||
@@ -415,6 +385,36 @@ services:
|
|||||||
CRON: ${CERTBOT_CRON}
|
CRON: ${CERTBOT_CRON}
|
||||||
# entrypoint: ["certonly"]
|
# entrypoint: ["certonly"]
|
||||||
|
|
||||||
|
# @NOTE https://tailscale.com/docs/features/containers/docker
|
||||||
|
# @NOTE https://tailscale.com/blog/docker-tailscale-guide
|
||||||
|
tailclient:
|
||||||
|
image: tailscale/tailscale:latest
|
||||||
|
container_name: tailclient
|
||||||
|
cap_add:
|
||||||
|
- SYS_MODULE
|
||||||
|
- NET_ADMIN
|
||||||
|
restart: unless-stopped
|
||||||
|
devices:
|
||||||
|
- /dev/net/tun:/dev/net/tun
|
||||||
|
volumes:
|
||||||
|
- /etc/localtime:/etc/localtime:ro
|
||||||
|
- /lib/modules:/lib/modules:ro
|
||||||
|
- "tailscale-lib:/var/lib/tailscale"
|
||||||
|
- ~/.config/tailscale:/config:Z
|
||||||
|
networks:
|
||||||
|
- hs
|
||||||
|
hostname: tailnet
|
||||||
|
env_file:
|
||||||
|
- ${HOME}/.all.env
|
||||||
|
# - ${HOME}/.tailscale.env
|
||||||
|
environment:
|
||||||
|
TS_AUTHKEY_FILE: /run/secrets/headscale.key
|
||||||
|
TS_SERVE_CONFIG: /config/conf.json
|
||||||
|
TS_EXTRA_ARGS: "--advertise-tags=tag:container"
|
||||||
|
TS_STATE_DIR: /var/lib/tailscale
|
||||||
|
secrets:
|
||||||
|
- headscale.key
|
||||||
|
|
||||||
dash:
|
dash:
|
||||||
image: glanceapp/glance
|
image: glanceapp/glance
|
||||||
container_name: dash
|
container_name: dash
|
||||||
|
|||||||
Reference in New Issue
Block a user