From e5f5980e0c4ec6ff19112378f9511bc144833a86 Mon Sep 17 00:00:00 2001 From: Tommy Date: Wed, 22 May 2024 12:17:24 -0700 Subject: [PATCH] Use After=network-online.target Signed-off-by: Tommy --- x86-QEMU-Docker.ign | 4 ++-- x86-QEMU-Docker.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x86-QEMU-Docker.ign b/x86-QEMU-Docker.ign index 29cfbe0..43aa1bc 100644 --- a/x86-QEMU-Docker.ign +++ b/x86-QEMU-Docker.ign @@ -237,7 +237,7 @@ "name": "postinst2.service" }, { - "contents": "[Unit]\nDescription=Download gVisor\nRequires=network-online.target\nBefore=docker.service\n\n[Service]\nUser=unpriv\nWorkingDirectory=/var/home/unpriv\nType=oneshot\nExecStart=/usr/bin/sleep 5\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc.sha512\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1.sha512\n\n[Install]\nWantedBy=multi-user.target\n", + "contents": "[Unit]\nDescription=Download gVisor\nAfter=network-online.target\nBefore=docker.service\n\n[Service]\nUser=unpriv\nWorkingDirectory=/var/home/unpriv\nType=oneshot\nExecStart=/usr/bin/sleep 5\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc.sha512\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1\nExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1.sha512\n\n[Install]\nWantedBy=multi-user.target\n", "enabled": true, "name": "gvisor-downloader.service" }, @@ -247,7 +247,7 @@ "name": "gvisor-updater.service" }, { - "contents": "[Unit]\nDescription=Docker Compose Updater for /srv/%I\nAfter=docker.service\nRequires=network-online.target\nRequires=docker.service\n\n[Service]\nType=oneshot\nUser=root\nGroup=root\nWorkingDirectory=/srv/%i\nExecStart=/usr/bin/docker image prune -f -a --filter 'until=240h'\n#ExecStart=/usr/bin/git pull\nExecStart=/usr/bin/docker compose pull\nExecStart=/usr/bin/docker compose up -d\n", + "contents": "[Unit]\nDescription=Docker Compose Updater for /srv/%I\nAfter=network-online.target\nAfter=docker.service\nRequires=docker.service\n\n[Service]\nType=oneshot\nUser=root\nGroup=root\nWorkingDirectory=/srv/%i\nExecStart=/usr/bin/docker image prune -f -a --filter 'until=240h'\n#ExecStart=/usr/bin/git pull\nExecStart=/usr/bin/docker compose pull\nExecStart=/usr/bin/docker compose up -d\n", "enabled": false, "name": "docker-compose-updater@.service" }, diff --git a/x86-QEMU-Docker.yml b/x86-QEMU-Docker.yml index 465b16c..84366c5 100644 --- a/x86-QEMU-Docker.yml +++ b/x86-QEMU-Docker.yml @@ -92,7 +92,7 @@ systemd: contents: | [Unit] Description=Download gVisor - Requires=network-online.target + After=network-online.target Before=docker.service [Service] @@ -131,8 +131,8 @@ systemd: contents: | [Unit] Description=Docker Compose Updater for /srv/%I + After=network-online.target After=docker.service - Requires=network-online.target Requires=docker.service [Service]