Simplified or removed post_install

tools/buildkit/Dockerfile.template

@@ -7,14 +7,15 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY init-buildkit "/uniget_bootstrap/etc/init.d/buildkit"
 RUN <<EOF
 check-github-release-asset "moby/buildkit" "v${version}" "buildkit-v${version}.linux-${alt_arch}.tar.gz"
 curl --silent --show-error --location --fail "https://github.com/moby/buildkit/releases/download/v${version}/buildkit-v${version}.linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner
 
-curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/buildkit.service" \
+curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/buildkit.service.go-template" \
     "https://github.com/moby/buildkit/raw/v${version}/examples/systemd/system/buildkit.service"
+sed -i -E 's|^ExecStart=/usr/local/bin/buildkitd|ExecStart={{ .Target }}/bin/buildkitd|' "${prefix}/etc/systemd/system/buildkit.service.go-template"
+
 curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/buildkit.socket" \
     "https://github.com/moby/buildkit/raw/v${version}/examples/systemd/system/buildkit.socket"
 EOF

tools/buildx/manifest.yaml

@@ -21,6 +21,16 @@ tags:
 - docker
 homepage: https://github.com/docker/buildx
 description: Docker CLI plugin for extended build capabilities with BuildKit
+messages:
+  internals: |
+    It is recommended to make buildx the default builder by adding the following
+    to you ~/.docker/config.json:
+
+        {
+            "aliases": {
+                "builder": "buildx"
+            }
+        }
 renovate:
   datasource: github-releases
   package: docker/buildx

tools/cascadia-code/manifest.yaml

@@ -10,6 +10,9 @@ tags:
 - font
 homepage: https://github.com/microsoft/cascadia-code
 description: Monospaced font that includes programming ligatures
+messages:
+  update: |
+    Please run: fc-cache -f -v
 renovate:
   datasource: github-releases
   package: microsoft/cascadia-code

tools/cni/Dockerfile.template

@@ -12,8 +12,11 @@ check-github-release-asset "containernetworking/plugins" "v${version}" "cni-plug
 mkdir -p "${prefix}/libexec/cni"
 curl --silent --show-error --location --fail "https://github.com/containernetworking/plugins/releases/download/v${version}/cni-plugins-linux-${alt_arch}-v${version}.tgz" \
 | tar --extract --gzip --directory="${prefix}/libexec/cni" --no-same-owner
+
 curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/cni-dhcp.service" \
     "https://github.com/containernetworking/plugins/raw/v${version}/plugins/ipam/dhcp/systemd/cni-dhcp.service"
+sed -i -E 's|^ExecStart=/opt/cni/bin/dhcp|ExecStart={{ .Target }}/libexec/cni/dhcp|' "${prefix}/etc/systemd/system/cni-dhcp.service"
+
 curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/cni-dhcp.socket" \
     "https://github.com/containernetworking/plugins/raw/v${version}/plugins/ipam/dhcp/systemd/cni-dhcp.socket"
 EOF

tools/containerd/10-containerd-net.conflist

@@ -1,29 +1,29 @@
-        {
-          "cniVersion": "1.0.0",
-          "name": "containerd-net",
-          "plugins": [
-            {
-              "type": "bridge",
-              "bridge": "cni0",
-              "isGateway": true,
-              "ipMasq": true,
-              "promiscMode": true,
-              "ipam": {
-                "type": "host-local",
-                "ranges": [
-                  [{
-                    "subnet": "172.129.0.0/16"
-                  }]
-                ],
-                "routes": [
-                  { "dst": "0.0.0.0/0" },
-                  { "dst": "::/0" }
-                ]
-              }
-            },
-            {
-              "type": "portmap",
-              "capabilities": {"portMappings": true}
-            }
-          ]
-        }
+{
+  "cniVersion": "1.0.0",
+  "name": "containerd-net",
+  "plugins": [
+    {
+      "type": "bridge",
+      "bridge": "cni0",
+      "isGateway": true,
+      "ipMasq": true,
+      "promiscMode": true,
+      "ipam": {
+        "type": "host-local",
+        "ranges": [
+          [{
+            "subnet": "172.129.0.0/16"
+          }]
+        ],
+        "routes": [
+          { "dst": "0.0.0.0/0" },
+          { "dst": "::/0" }
+        ]
+      }
+    },
+    {
+      "type": "portmap",
+      "capabilities": {"portMappings": true}
+    }
+  ]
+}

tools/containerd/Dockerfile.template

@@ -13,14 +13,14 @@ ARG version
 COPY 10-containerd-net.conflist "/uniget_bootstrap/etc/cni/net.d/"
 COPY runtimes.toml "/uniget_bootstrap/etc/containerd/conf.d/runtimes.toml"
 COPY snapshotters.toml "/uniget_bootstrap/etc/containerd/conf.d/snapshotters.toml"
-COPY init-containerd "/uniget_bootstrap/etc/init.d/containerd"
 RUN <<EOF
 check-github-release-asset "containerd/containerd" "v${version}" "containerd-${version}-linux-${alt_arch}.tar.gz"
 curl --silent --show-error --location --fail "https://github.com/containerd/containerd/releases/download/v${version}/containerd-${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}" --no-same-owner
 
-curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/containerd.service" \
+curl --silent --show-error --location --fail --output "${prefix}/etc/systemd/system/containerd.service.go-template" \
     "https://github.com/containerd/containerd/raw/v${version}/containerd.service"
+sed -i -E "s|^ExecStart=/usr/local/bin/containerd|ExecStart={{ .Target }}/bin/containerd|" "${prefix}/etc/systemd/system/containerd.service.go-template"
 EOF
 RUN <<EOF
 curl --silent --show-error --location --fail --output "${prefix}/share/man/man8/containerd-config.8.md" \
@@ -36,4 +36,15 @@ go-md2man \
 rm \
     "${prefix}/share/man/man8/containerd-config.8.md" \
     "${prefix}/share/man/man5/containerd-config.toml.5.md"
+EOF
+RUN <<EOF
+mkdir -p \
+    /etc/containerd/conf.d \
+    /etc/containerd/certs.d
+
+"${prefix}/bin/containerd" config default \
+| sed "s|/opt/cni/bin|{{ .Target }}/libexec/cni|" \
+| sed 's|imports = \[\]|imports = [ "/etc/containerd/conf.d/*.toml" ]|' \
+| sed 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' \
+>"/etc/containerd/config.toml.template.go-template"
 EOF