Merge branch 'main' into debug_dhcp

Author: mergify[bot]

.github/workflows/ci.yaml

@@ -40,7 +40,7 @@ jobs:
         push: true
         tags: localhost:5000/tinkerbell/hook-docker:0.0
 
-    - uses: cachix/install-nix-action@v13
+    - uses: cachix/install-nix-action@v14
       with:
         nix_path: nixpkgs=channel:nixos-unstable
 

.github/workflows/push.yaml

@@ -40,7 +40,7 @@ jobs:
         push: true
         tags: quay.io/tinkerbell/hook-docker:0.0
 
-    - uses: cachix/install-nix-action@v13
+    - uses: cachix/install-nix-action@v14
       with:
         nix_path: nixpkgs=channel:nixos-unstable
 

hook.yaml

@@ -13,10 +13,6 @@ onboot:
     image: linuxkit/sysfs:v0.8
   - name: dhcpcd
     image: linuxkit/dhcpcd:v0.8
-    binds:
-     - /etc/resolv.conf:/etc/resolv.conf
-     - /run:/run
-     - /var/lib/dhcpcd:/var/lib/dhcpcd
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
 services:
   - name: getty
@@ -27,10 +23,6 @@ services:
     image: linuxkit/rngd:v0.8
   - name: dhcpcd
     image: linuxkit/dhcpcd:v0.8
-    binds:
-     - /etc/resolv.conf:/etc/resolv.conf
-     - /run:/run
-     - /var/lib/dhcpcd:/var/lib/dhcpcd
   - name: ntpd
     image: linuxkit/openntpd:v0.8
     binds:
@@ -74,6 +66,10 @@ services:
 files:
   - path: etc/docker/daemon.json
     contents: '{"debug": true}'
+  - path: etc/profile.d/local.sh
+    contents: |
+      alias docker='ctr -n services.linuxkit tasks exec --tty --exec-id shell docker docker'
+    mode: "0644"
 trust:
   org:
     - linuxkit

hook_debug.yaml

@@ -70,6 +70,10 @@ files:
     source: ~/.ssh/id_rsa.pub
     mode: "0600"
     optional: true
+  - path: etc/profile.d/local.sh
+    contents: |
+      alias docker='ctr -n services.linuxkit tasks exec --tty --exec-id shell docker docker'
+    mode: "0644"
 trust:
   org:
     - linuxkit