More multi-arch tools

nicholasdille · nicholasdille · commit 204e09a36094 · 2023-01-25T22:30:53.000+01:00
diff --git a/tools/bin/Dockerfile.template b/tools/bin/Dockerfile.template
@@ -1,13 +1,21 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM --platform=amd64 ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}${target}/bin/bin" \
     "https://github.com/marcosnils/bin/releases/download/v${version}/bin_${version}_Linux_${arch}"
 chmod +x "${prefix}${target}/bin/bin"
+EOF
+
+FROM --platform=arm64 ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
+ARG name
+ARG version
+RUN <<EOF
+curl --silent --location --fail --output "${prefix}${target}/bin/bin" \
+    "https://github.com/marcosnils/bin/releases/download/v${version}/bin_${version}_Linux_${alt_arch}"
+chmod +x "${prefix}${target}/bin/bin"
 EOF
diff --git a/tools/bin/manifest.yaml b/tools/bin/manifest.yaml
@@ -1,6 +1,9 @@
 name: bin
 version: "0.15.2"
 check: ${binary} --version | grep ^bin | cut -d' ' -f3
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - type/cli
 - management
diff --git a/tools/buildkit/Dockerfile.template b/tools/buildkit/Dockerfile.template
@@ -1,13 +1,11 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 COPY init-buildkit "${prefix}/etc/init.d/buildkit"
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/moby/buildkit/releases/download/v${version}/buildkit-v${version}.linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner
diff --git a/tools/buildkit/manifest.yaml b/tools/buildkit/manifest.yaml
@@ -2,6 +2,9 @@ name: buildkit
 version: "0.11.1"
 binary: buildkitd
 check: ${binary} --version | cut -d' ' -f3 | tr -d v
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - org/moby
 - standard/oci
diff --git a/tools/cni/Dockerfile.template b/tools/cni/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 mkdir -p "${prefix}${target}/libexec/cni"
 curl --silent --location --fail "https://github.com/containernetworking/plugins/releases/download/v${version}/cni-plugins-linux-${alt_arch}-v${version}.tgz" \
diff --git a/tools/cni/manifest.yaml b/tools/cni/manifest.yaml
@@ -2,6 +2,9 @@ name: cni
 version: "1.2.0"
 binary: ${target}/libexec/cni/loopback
 check: ${binary} 2>&1 | cut -d' ' -f4 | tr -d v
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - kubernetes
 - component/network
diff --git a/tools/containerd/Dockerfile.template b/tools/containerd/Dockerfile.template
@@ -1,27 +1,24 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
+
 FROM ghcr.io/nicholasdille/docker-setup/go-md2man:${ref} AS go-md2man
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 COPY --link --from=go-md2man / /
-
 COPY 10-containerd-net.conflist "${prefix}/etc/cni/net.d/"
 COPY runtimes.toml "${prefix}/etc/containerd/conf.d/runtimes.toml"
 COPY snapshotters.toml "${prefix}/etc/containerd/conf.d/snapshotters.toml"
 COPY init-containerd "${prefix}/etc/init.d/containerd"
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/containerd/containerd/releases/download/v${version}/containerd-${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}" --no-same-owner
 curl --silent --location --fail --output "${prefix}/etc/systemd/system/containerd.service" \
     "https://github.com/containerd/containerd/raw/v${version}/containerd.service"
 chmod +x "${prefix}/etc/init.d/containerd"
 EOF
-
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}${target}/share/man/man8/containerd-config.8.md" \
     "https://github.com/containerd/containerd/raw/v${version}/docs/man/containerd-config.8.md"
diff --git a/tools/containerd/manifest.yaml b/tools/containerd/manifest.yaml
@@ -1,11 +1,15 @@
 name: containerd
 version: "1.6.15"
 check: ${binary} --version | cut -d' ' -f3 | tr -d v
+build_dependencies:
+- go-md2man
 runtime_dependencies:
 - runc
 - cni
 - crictl
-- go-md2man
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - org/cncf
 - org/containerd
diff --git a/tools/crictl/Dockerfile.template b/tools/crictl/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/kubernetes-sigs/cri-tools/releases/download/v${version}/crictl-v${version}-linux-${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory "${prefix}${target}" --no-same-owner
diff --git a/tools/crictl/manifest.yaml b/tools/crictl/manifest.yaml
@@ -1,6 +1,9 @@
 name: crictl
 version: "1.26.0"
 check: ${binary} --version | cut -d' ' -f3 | tr -d v
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - org/cncf
 - standard/cri
diff --git a/tools/dive/Dockerfile.template b/tools/dive/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/wagoodman/dive/releases/download/v${version}/dive_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
diff --git a/tools/dive/manifest.yaml b/tools/dive/manifest.yaml
@@ -3,6 +3,8 @@ version: "0.10.0"
 check: ${binary} --version | cut -d' ' -f2
 runtime_dependencies:
 - docker
+platforms:
+- linux/amd64
 tags:
 - standard/oci
 - standard/docker
diff --git a/tools/docker-base/Dockerfile.template b/tools/docker-base/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/docker/base-cli-plugin/releases/download/v${version}/base-cli-plugin_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
diff --git a/tools/docker-base/manifest.yaml b/tools/docker-base/manifest.yaml
@@ -3,6 +3,9 @@ version: "0.3.0"
 check: "" # No version parameter
 runtime_dependencies:
 - docker
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - standard/docker
 - org/docker
diff --git a/tools/docker-compose-switch/Dockerfile.template b/tools/docker-compose-switch/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}${target}/bin/docker-compose-switch" \
     "https://github.com/docker/compose-switch/releases/download/v${version}/docker-compose-linux-${alt_arch}"
diff --git a/tools/docker-compose-switch/manifest.yaml b/tools/docker-compose-switch/manifest.yaml
@@ -1,6 +1,9 @@
 name: docker-compose-switch
 version: "1.0.5"
 check: "" # No dedicated version
+platforms:
+- linux/amd64
+- linux/arm64
 flags:
 - not-docker-compose-v1
 tags:
diff --git a/tools/docker-compose/Dockerfile.template b/tools/docker-compose/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}${target}/libexec/docker/cli-plugins/docker-compose" \
     "https://github.com/docker/compose/releases/download/v${version}/docker-compose-linux-${arch}"
diff --git a/tools/docker-index/Dockerfile.template b/tools/docker-index/Dockerfile.template
@@ -5,9 +5,8 @@ ARG ref=main
 FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
-curl --silent --location --fail "https://github.com/docker/index-cli-plugin/releases/download/v0.0.28/docker-index_0.0.28_linux_amd64.tar.gz" \
+curl --silent --location --fail "https://github.com/docker/index-cli-plugin/releases/download/v${version}/docker-index_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
     docker-index
 "${prefix}${target}/libexec/docker/cli-plugins/docker-index" completion bash | sed "s|${prefix}||g" >"${prefix}${target}/share/bash-completion/completions/docker-index"
diff --git a/tools/docker-index/manifest.yaml b/tools/docker-index/manifest.yaml
@@ -4,6 +4,9 @@ binary: ${target}/libexec/docker/cli-plugins/docker-index
 check: ${binary} version | grep ^version | cut -d' ' -f2 | tr -d v
 runtime_dependencies:
 - docker
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - org/docker
 - category/security
diff --git a/tools/docker-lock/Dockerfile.template b/tools/docker-lock/Dockerfile.template
@@ -1,20 +1,21 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM --platform=amd64 ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
-curl --silent --location --fail "https://github.com/safe-waters/docker-lock/releases/download/v${version}/docker-lock_${version}_Linux_x86_64.tar.gz" \
+curl --silent --location --fail "https://github.com/safe-waters/docker-lock/releases/download/v${version}/docker-lock_${version}_Linux_${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
     docker-lock
 EOF
 
-# completion
-#RUN <<EOF
-#"${prefix}${target}/bin/foo" completion bash >"${prefix}${target}/share/bash-completion/completions/foo"
-#"${prefix}${target}/bin/foo" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/foo.fish"
-#"${prefix}${target}/bin/foo" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_foo"
-#EOF
+FROM --platform=arm64 ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
+ARG name
+ARG version
+RUN <<EOF
+curl --silent --location --fail "https://github.com/safe-waters/docker-lock/releases/download/v${version}/docker-lock_${version}_Linux_${alt_arch}.tar.gz" \
+| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+    docker-lock
+EOF
diff --git a/tools/docker-lock/manifest.yaml b/tools/docker-lock/manifest.yaml
@@ -4,6 +4,9 @@ binary: ${target}/libexec/docker/cli-plugins/docker-lock
 check: ${binary} lock version
 runtime_dependencies:
 - docker
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - standard/docker
 - category/development
diff --git a/tools/docker-manpages/manifest.yaml b/tools/docker-manpages/manifest.yaml
@@ -2,6 +2,9 @@ name: docker-manpages
 version: "20.10.23"
 binary: false
 check: "" # No binary
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - org/docker
 - standard/docker
diff --git a/tools/docker-sbom/Dockerfile.template b/tools/docker-sbom/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/docker/sbom-cli-plugin/releases/download/v${version}/sbom-cli-plugin_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/libexec/docker/cli-plugins" --no-same-owner \
diff --git a/tools/docker-sbom/manifest.yaml b/tools/docker-sbom/manifest.yaml
@@ -4,6 +4,9 @@ binary: ${target}/libexec/docker/cli-plugins/docker-sbom
 check: ${binary} sbom --version | cut -d, -f1 | cut -d' ' -f2
 runtime_dependencies:
 - docker
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - standard/docker
 - org/docker
diff --git a/tools/docker-scan/Dockerfile.template b/tools/docker-scan/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail --output "${prefix}${target}/libexec/docker/cli-plugins/docker-scan" \
     "https://github.com/docker/scan-cli-plugin/releases/download/v${version}/docker-scan_linux_${alt_arch}"
diff --git a/tools/docker-scan/manifest.yaml b/tools/docker-scan/manifest.yaml
@@ -4,6 +4,9 @@ binary: ${target}/libexec/docker/cli-plugins/docker-scan
 check: ${binary} scan --version | grep ^Version | tr -s ' ' | cut -d' ' -f2 | tr -d v
 runtime_dependencies:
 - docker
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - standard/docker
 - org/docker
diff --git a/tools/go-md2man/manifest.yaml b/tools/go-md2man/manifest.yaml
@@ -1,6 +1,9 @@
 name: go-md2man
 version: "2.0.2"
 check: "" # No version parameter
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - type/cli
 - markdown
diff --git a/tools/grype/Dockerfile.template b/tools/grype/Dockerfile.template
@@ -1,11 +1,10 @@
 #syntax=docker/dockerfile:1.5.1
 
 ARG ref=main
-FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 
+FROM ghcr.io/nicholasdille/docker-setup/base:${ref} AS prepare
 ARG name
 ARG version
-
 RUN <<EOF
 curl --silent --location --fail "https://github.com/anchore/grype/releases/download/v${version}/grype_${version}_linux_${alt_arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}${target}/bin" --no-same-owner \
diff --git a/tools/grype/manifest.yaml b/tools/grype/manifest.yaml
@@ -1,6 +1,9 @@
 name: grype
 version: "0.55.0"
 check: ${binary} version | grep "^Version:" | tr -s ' ' | cut -d' ' -f2
+platforms:
+- linux/amd64
+- linux/arm64
 tags:
 - category/security
 - type/cli
diff --git a/tools/nerdctl/Dockerfile.template b/tools/nerdctl/Dockerfile.template
diff --git a/tools/nerdctl/manifest.yaml b/tools/nerdctl/manifest.yaml
diff --git a/tools/runc/Dockerfile.template b/tools/runc/Dockerfile.template
diff --git a/tools/runc/manifest.yaml b/tools/runc/manifest.yaml
diff --git a/tools/syft/manifest.yaml b/tools/syft/manifest.yaml
diff --git a/tools/trivy/Dockerfile.template b/tools/trivy/Dockerfile.template
diff --git a/tools/trivy/manifest.yaml b/tools/trivy/manifest.yaml
