Enable gvisor updater

Signed-off-by: Tommy <contact@tommytran.io>
2024-11-22 01:11:34 -05:00 · 2023-03-16 14:03:16 -04:00 · 2023-03-16 14:03:16 -04:00 · e04ff2250e
commit e04ff2250e
parent e1bb116517
4 changed files with 48 additions and 48 deletions
--- a/Docker-Compose.ign
+++ b/Docker-Compose.ign
--- a/Docker-Compose.yml
+++ b/Docker-Compose.yml
@ -59,6 +59,29 @@ systemd:
        ExecStart=/usr/sbin/setsebool virt_use_nfs off
        ExecStart=/usr/sbin/setsebool virt_use_samba off
        RemainAfterExit=yes
+        [Install]
+        WantedBy=multi-user.target
+    - name: gvisor-updater.service
+      enabled: true
+      contents: |
+        [Unit]
+        Description=gVisor Update
+        Require=network-online.target
+        Before=docker.service
+
+        [Service]
+        WorkingDirectory=/var/roothome
+        Type=oneshot
+        ExecStart=/usr/bin/sleep 5
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc.sha512
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1.sha512
+        ExecStart=/usr/bin/sha512sum -c runsc.sha512 -c containerd-shim-runsc-v1.sha512
+        ExecStart=/usr/bin/rm -f runsc.sha512 containerd-shim-runsc-v1.sha512
+        ExecStart=/usr/bin/chmod a+rx runsc containerd-shim-runsc-v1
+        ExecStart=/usr/bin/mv runsc containerd-shim-runsc-v1 /var/usrlocal/bin
+
        [Install]
        WantedBy=multi-user.target
    - name: docker.service
@ -144,29 +167,6 @@ storage:
          ExecStart=/usr/bin/docker-compose up -d
          Type=oneshot

-          [Install]
-          WantedBy=multi-user.target
-    - path: /etc/systemd/system/gvisor-updater.service
-      contents:
-        inline: |
-          [Unit]
-          Description=gVisor Update
-          Require=network-online.target
-          Before=docker.service
-
-          [Service]
-          WorkingDirectory=/var/roothome
-          Type=oneshot
-          ExecStart=/usr/bin/sleep 5
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc.sha512
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1.sha512
-          ExecStart=/usr/bin/sha512sum -c runsc.sha512 -c containerd-shim-runsc-v1.sha512
-          ExecStart=/usr/bin/rm -f runsc.sha512 containerd-shim-runsc-v1.sha512
-          ExecStart=/usr/bin/chmod a+rx runsc containerd-shim-runsc-v1
-          ExecStart=/usr/bin/mv runsc containerd-shim-runsc-v1 /var/usrlocal/bin
-
          [Install]
          WantedBy=multi-user.target
    - path: /etc/unbound/unbound.conf
--- a/Generic.ign
+++ b/Generic.ign
--- a/Generic.yml
+++ b/Generic.yml
@ -77,6 +77,29 @@ systemd:
        ExecStart=/usr/sbin/setsebool virt_use_nfs off
        ExecStart=/usr/sbin/setsebool virt_use_samba off
        RemainAfterExit=yes
+        [Install]
+        WantedBy=multi-user.target
+    - name: gvisor-updater.service
+      enabled: true
+      contents: |
+        [Unit]
+        Description=gVisor Update
+        Require=network-online.target
+        Before=docker.service
+
+        [Service]
+        WorkingDirectory=/var/roothome
+        Type=oneshot
+        ExecStart=/usr/bin/sleep 5
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc.sha512
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1
+        ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1.sha512
+        ExecStart=/usr/bin/sha512sum -c runsc.sha512 -c containerd-shim-runsc-v1.sha512
+        ExecStart=/usr/bin/rm -f runsc.sha512 containerd-shim-runsc-v1.sha512
+        ExecStart=/usr/bin/chmod a+rx runsc containerd-shim-runsc-v1
+        ExecStart=/usr/bin/mv runsc containerd-shim-runsc-v1 /var/usrlocal/bin
+
        [Install]
        WantedBy=multi-user.target
    - name: docker.service
@ -144,29 +167,6 @@ storage:
        inline: |
          GSSAPIAuthentication no
          VerifyHostKeyDNS yes
-    - path: /etc/systemd/system/gvisor-updater.service
-      contents:
-        inline: |
-          [Unit]
-          Description=gVisor Update
-          Require=network-online.target
-          Before=docker.service
-
-          [Service]
-          WorkingDirectory=/var/roothome
-          Type=oneshot
-          ExecStart=/usr/bin/sleep 5
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/runsc.sha512
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1
-          ExecStart=/usr/bin/curl -O https://storage.googleapis.com/gvisor/releases/release/latest/x86_64/containerd-shim-runsc-v1.sha512
-          ExecStart=/usr/bin/sha512sum -c runsc.sha512 -c containerd-shim-runsc-v1.sha512
-          ExecStart=/usr/bin/rm -f runsc.sha512 containerd-shim-runsc-v1.sha512
-          ExecStart=/usr/bin/chmod a+rx runsc containerd-shim-runsc-v1
-          ExecStart=/usr/bin/mv runsc containerd-shim-runsc-v1 /var/usrlocal/bin
-
-          [Install]
-          WantedBy=multi-user.target
    - path: /etc/unbound/unbound.conf
      overwrite: true
      contents: