Drop hook_debug.yaml in favor of processing hook.yaml

This way we only have one source file to manage and we don't have to worry
about the debug matching the production one. Debug was not updated to the
new kernel nor the ntpd bind mount addition.

Signed-off-by: Manuel Mendez <github@i.m.mmlb.dev>

Author: mmlb

.gitignore

@@ -2,6 +2,7 @@ bin/
 dist/
 .env
 hook-bootkit/local/
+hook-debug.*.yaml
 hook-docker/local/
 hook-*.tar.gz
 hook.*.yaml

Makefile

@@ -23,6 +23,10 @@ hook.$(TAG).yaml: $(LINUXKIT_CONFIG)
 	sed '/quay.io/ s|:latest|:$(TAG)|' $^ > $@.tmp
 	mv $@.tmp $@
 
+hook-debug.$(TAG).yaml: hook.$(TAG).yaml
+	sed '/^\s*#dbg/ s|#dbg||' $^ > $@.tmp
+	mv $@.tmp $@
+
 image-amd64: hook.$(TAG).yaml
 	mkdir -p out
 	linuxkit build -docker -pull -format kernel+initrd -name hook-x86_64 -dir out $^
@@ -41,13 +45,13 @@ dev-image-arm64: hook.$(TAG).yaml
 
 image: image-amd64 image-arm64
 
-debug-image-amd64:
+debug-image-amd64: hook-debug.$(TAG).yaml
 	mkdir -p out/amd64
-	linuxkit build --docker -format kernel+initrd -name debug-x86_64 -dir out hook_debug.yaml
+	linuxkit build --docker -format kernel+initrd -name debug-x86_64 -dir out $^
 
-debug-image-arm64:
+debug-image-arm64: hook-debug.$(TAG).yaml
 	mkdir -p out/arm64
-	linuxkit build --docker -arch arm64 -format kernel+initrd -name debug-aarch64 -dir out hook_debug.yaml
+	linuxkit build --docker -arch arm64 -format kernel+initrd -name debug-aarch64 -dir out $^
 
 debug-image: debug-image-amd64 debug-image-arm64
 

hook.yaml

@@ -1,16 +1,20 @@
 kernel:
   image: quay.io/tinkerbell/hook-kernel:5.10.85
   cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0"
+
 init:
   - linuxkit/init:v0.8
   - linuxkit/runc:v0.8
   - linuxkit/containerd:v0.8
   - linuxkit/ca-certificates:v0.8
+
 onboot:
   - name: sysctl
     image: linuxkit/sysctl:v0.8
+
   - name: sysfs
     image: linuxkit/sysfs:v0.8
+
   - name: dhcpcd
     image: linuxkit/dhcpcd:v0.8
     command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
@@ -20,15 +24,18 @@ onboot:
     runtime:
       mkdir:
         - /var/lib/dhcpcd
+
 services:
   - name: getty
     image: linuxkit/getty:v0.8
     binds.add:
       - /etc/profile.d/local.sh:/etc/profile.d/local.sh
     env:
       - INSECURE=true
+
   - name: rngd
     image: linuxkit/rngd:v0.8
+
   - name: dhcpcd
     image: linuxkit/dhcpcd:v0.8
     binds.add:
@@ -37,6 +44,7 @@ services:
     runtime:
       mkdir:
         - /var/lib/dhcpcd
+
   - name: ntpd
     image: linuxkit/openntpd:v0.8
     binds:
@@ -52,13 +60,14 @@ services:
       - type: cgroup
         options: ["rw", "nosuid", "noexec", "nodev", "relatime"]
     binds:
+      #dbg- /etc/docker/daemon.json:/etc/docker/daemon.json
+      - /dev/console:/dev/console
+      - /dev:/dev
       - /etc/resolv.conf:/etc/resolv.conf
       - /lib/modules:/lib/modules
       - /var/run/docker:/var/run
-      - /var/run/worker:/worker
-      - /dev/console:/dev/console
-      - /dev:/dev
       - /var/run/images:/var/lib/docker
+      - /var/run/worker:/worker
     runtime:
       mkdir:
         - /var/run/images
@@ -78,12 +87,22 @@ services:
     runtime:
       mkdir:
         - /var/run/docker
+
+#dbg  - name: sshd
+#dbg    image: linuxkit/sshd:666b4a1a323140aa1f332826164afba506abf597
+
 files:
   - path: etc/profile.d/local.sh
     contents: |
       alias docker='ctr -n services.linuxkit tasks exec --tty --exec-id cmd docker docker'
       alias docker-shell='ctr -n services.linuxkit tasks exec --tty --exec-id shell docker sh'
     mode: "0644"
+
+#dbg  - path: root/.ssh/authorized_keys
+#dbg    source: ~/.ssh/id_rsa.pub
+#dbg    mode: "0600"
+#dbg    optional: true
+
 trust:
   org:
     - linuxkit