diff --git a/.vscode/settings.json b/.vscode/settings.json index cede486..8bdf79a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,4 +2,11 @@ "ansible.python.interpreterPath": "/bin/python3", "ansibleVaultInline.keyfile": "~/.vault_pass", "yaml.customTags": ["!vault scalar"], + "yaml.schemas": { + "https://raw.githubusercontent.com/compose-spec/compose-spec/master/schema/compose-spec.json": [ + "docker-compose.yml", + "docker-compose.yaml", + "**/docker-compose*.yml" + ] + } } \ No newline at end of file diff --git a/firstrun.sh b/firstrun.sh index 85639c0..46453f9 100644 --- a/firstrun.sh +++ b/firstrun.sh @@ -4,5 +4,5 @@ # ie # docker setup, docker-compose install # restic restore from misamisa -ansible-pull --clean --vault-password-file ./vault.pass --private-key ~/.ssh/github_ro -U git@github.com:tolerryan/Watari-Ansible.git playbooks/setup-lxc.yaml +ansible-pull --clean --vault-password-file ./vault.pass --inventory ./inventory.yml --private-key ~/.ssh/github_ro -U git@github.com:tolerryan/Watari-Ansible.git playbooks/setup-lxc.yaml systemctl disable firstrun.service \ No newline at end of file diff --git a/playbooks/grail/docker-compose.yml b/playbooks/grail/docker-compose.yml index abce953..1724eea 100644 --- a/playbooks/grail/docker-compose.yml +++ b/playbooks/grail/docker-compose.yml @@ -5,14 +5,16 @@ networks: ipam: driver: default config: - - subnet: ${DOCKER_SUBNET:?err} - gateway: ${DOCKER_GATEWAY:?err} + - subnet: ${DOCKER_SUBNET:?err} + gateway: ${DOCKER_GATEWAY:?err} services: gluetun: image: qmcgaw/gluetun:latest container_name: gluetun restart: always + env_file: + - ./docker-compose.env cap_add: - NET_ADMIN devices: