Merge branch 'main' into remove-target-c

uniget-org · Dec 31, 2023 · 0e21739 · 0e21739
2 parents 737d2a3 + 8483e36
commit 0e21739
Show file tree

Hide file tree

Showing 95 changed files with 588 additions and 470 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -17,6 +17,8 @@ jobs:
 
   collect:
     name: Collect tools
+    permissions:
+      pull-requests: read
     runs-on: ubuntu-22.04
     outputs:
       tools: ${{ steps.collect.outputs.tools }}

diff --git a/@template/Dockerfile.template b/@template/Dockerfile.template
@@ -120,8 +120,8 @@ ARG version
 #EOF
 
 # python
-#COPY --link --from=python / /
-#COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+#COPY --link --from=shiv / /usr/local/
 #RUN <<EOF
 #apt-get update
 #apt-get -y install --no-install-recommends \

diff --git a/tools/aws/Dockerfile.template b/tools/aws/Dockerfile.template
@@ -15,7 +15,7 @@ apt-get -y install --no-install-recommends \
     python3-venv \
     python-is-python3
 EOF
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 ARG name
 ARG version

diff --git a/tools/az/Dockerfile.template b/tools/az/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update

diff --git a/tools/bogrod/Dockerfile.template b/tools/bogrod/Dockerfile.template
@@ -8,7 +8,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
+#COPY --link --from=python / /usr/local/
 COPY --link --from=shiv / /
 RUN <<EOF
 apt-get update

diff --git a/tools/cve-bin-tool/Dockerfile.template b/tools/cve-bin-tool/Dockerfile.template
@@ -8,8 +8,8 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
     /etc/profile.d/ \
     /etc/profile.d/
 SHELL [ "bash", "-clo", "errexit" ]
-#COPY --link --from=python / /
-COPY --link --from=shiv / /
+#COPY --link --from=python / /usr/local/
+COPY --link --from=shiv / /usr/local/
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \

diff --git a/tools/devcontainer/Dockerfile.template b/tools/devcontainer/Dockerfile.template
@@ -12,7 +12,7 @@ COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
 SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
-COPY --link --from=python / /
+COPY --link --from=python / /usr/local/
 COPY --link --from=nodejs / /
 COPY --link --from=npm / /
 COPY --link --from=make / /

diff --git a/tools/faas-cli/Dockerfile.template b/tools/faas-cli/Dockerfile.template
@@ -1,14 +1,17 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
 
 RUN <<EOF
 check-github-release-asset "openfaas/faas-cli" "${version}" "faas-cli"
-curl --silent --location --fail --output "${prefix}${target}/bin/faas-cli" \
+curl --silent --location --fail --output "${prefix}/bin/faas-cli" \
     "https://github.com/openfaas/faas-cli/releases/download/${version}/faas-cli"
-chmod +x "${prefix}${target}/bin/faas-cli"
+chmod +x "${prefix}/bin/faas-cli"
 EOF
diff --git a/tools/faasd/Dockerfile.template b/tools/faasd/Dockerfile.template
@@ -1,19 +1,22 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
 
 RUN <<EOF
 check-github-release-asset "openfaas/faasd" "${version}" "faasd"
-curl --silent --location --fail --output "${prefix}${target}/bin/faasd" \
+curl --silent --location --fail --output "${prefix}/bin/faasd" \
     "https://github.com/openfaas/faasd/releases/download/${version}/faasd"
-chmod +x "${prefix}${target}/bin/faasd"
+chmod +x "${prefix}/bin/faasd"
 
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/faasd.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/faasd.service" \
     "https://github.com/openfaas/faasd/raw/${version}/hack/faasd.service"
-curl --silent --location --fail --output "${prefix}${target}/etc/systemd/system/faasd-provider.service" \
+curl --silent --location --fail --output "${prefix}/etc/systemd/system/faasd-provider.service" \
     "https://github.com/openfaas/faasd/raw/${version}/hack/faasd-provider.service"
 EOF
diff --git a/tools/falco/Dockerfile.template b/tools/falco/Dockerfile.template
@@ -1,19 +1,21 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
 curl --silent --location --fail "https://download.falco.org/packages/bin/${arch}/falco-${version}-${arch}.tar.gz" \
 | tar --extract --gzip --directory="${prefix}" --strip-components=1 --no-same-owner
 
-mv "${prefix}/usr/bin/" "${prefix}${target}/"
-mv "${prefix}/usr/src/" "${prefix}${target}/"
-mv "${prefix}/usr/share/falco/" "${prefix}${target}/share/"
+mv "${prefix}/usr/bin/" "${prefix}/"
+mv "${prefix}/usr/src/" "${prefix}/"
+mv "${prefix}/usr/share/falco/" "${prefix}/share/"
 
-"${prefix}${target}/bin/falcoctl" completion bash >"${prefix}${target}/share/bash-completion/completions/falcoctl"
-"${prefix}${target}/bin/falcoctl" completion fish >"${prefix}${target}/share/fish/vendor_completions.d/falcoctl.fish"
-"${prefix}${target}/bin/falcoctl" completion zsh >"${prefix}${target}/share/zsh/vendor-completions/_falcoctl"
+"${prefix}/bin/falcoctl" completion bash >"${prefix}/share/bash-completion/completions/falcoctl"
+"${prefix}/bin/falcoctl" completion fish >"${prefix}/share/fish/vendor_completions.d/falcoctl.fish"
+"${prefix}/bin/falcoctl" completion zsh >"${prefix}/share/zsh/vendor-completions/_falcoctl"
 EOF
diff --git a/tools/falcosidekick/Dockerfile.template b/tools/falcosidekick/Dockerfile.template
@@ -1,13 +1,15 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "falcosecurity/falcosidekick" "${version}" "falcosidekick_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/falcosecurity/falcosidekick/releases/download/${version}/falcosidekick_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     falcosidekick
 EOF
diff --git a/tools/fd/Dockerfile.template b/tools/fd/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
@@ -24,15 +26,15 @@ check-github-release-asset "sharkdp/fd" "v${version}" "fd-v${version}-${arch}-un
 
 echo "### Downloading fd ${version}"
 curl --silent --location --fail "https://github.com/sharkdp/fd/releases/download/v${version}/fd-v${version}-${arch}-unknown-linux-${arch_suffix}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --strip-components=1 --no-same-owner \
     "fd-v${version}-${arch}-unknown-linux-${arch_suffix}/fd" \
     "fd-v${version}-${arch}-unknown-linux-${arch_suffix}/fd.1" \
     "fd-v${version}-${arch}-unknown-linux-${arch_suffix}/autocomplete"
 
-mv "${prefix}${target}/bin/fd.1" "${prefix}${target}/share/man/man1/"
+mv "${prefix}/bin/fd.1" "${prefix}/share/man/man1/"
 
-mv "${prefix}${target}/bin/autocomplete/fd.bash" "${prefix}${target}/share/bash-completion/completions/fd"
-mv "${prefix}${target}/bin/autocomplete/fd.fish" "${prefix}${target}/share/fish/vendor_completions.d/fd.fish"
-mv "${prefix}${target}/bin/autocomplete/_fd"     "${prefix}${target}/share/zsh/vendor-completions/_fd"
-rm -rf "${prefix}${target}/bin/autocomplete"
+mv "${prefix}/bin/autocomplete/fd.bash" "${prefix}/share/bash-completion/completions/fd"
+mv "${prefix}/bin/autocomplete/fd.fish" "${prefix}/share/fish/vendor_completions.d/fd.fish"
+mv "${prefix}/bin/autocomplete/_fd"     "${prefix}/share/zsh/vendor-completions/_fd"
+rm -rf "${prefix}/bin/autocomplete"
 EOF
diff --git a/tools/figlet/Dockerfile.template b/tools/figlet/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ubuntu:22.04 AS build
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -19,11 +21,6 @@ RUN <<EOF
 check-download "http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz"
 curl --silent --location --fail "http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz" \
 | tar --extract --gzip --strip-components=1
-make figlet LDFLAGS=-static DEFAULTFONTDIR=${target}/share/figlet
-make install prefix=/opt/figlet
-EOF
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-ARG name
-ARG version
-COPY --from=build /opt/figlet/ ${prefix}${target}/
+make figlet LDFLAGS=-static DEFAULTFONTDIR=/share/figlet
+make install prefix="${prefix}"
+EOF
diff --git a/tools/firecracker/Dockerfile.template b/tools/firecracker/Dockerfile.template
@@ -1,19 +1,22 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
 
 RUN <<EOF
 check-github-release-asset "firecracker-microvm/firecracker" "v${version}" "firecracker-v${version}-${arch}.tgz"
 curl --silent --location --fail "https://github.com/firecracker-microvm/firecracker/releases/download/v${version}/firecracker-v${version}-${arch}.tgz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin" --strip-components=1 --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin" --strip-components=1 --no-same-owner \
     release-v${version}-${arch}/firecracker-v${version}-${arch} \
     release-v${version}-${arch}/jailer-v${version}-${arch} \
     release-v${version}-${arch}/seccompiler-bin-v${version}-${arch}
-mv "${prefix}${target}/bin/firecracker-v${version}-${arch}"     "${prefix}${target}/bin/firecracker"
-mv "${prefix}${target}/bin/jailer-v${version}-${arch}"          "${prefix}${target}/bin/jailer"
-mv "${prefix}${target}/bin/seccompiler-bin-v${version}-${arch}" "${prefix}${target}/bin/seccompiler-bin"
+mv "${prefix}/bin/firecracker-v${version}-${arch}"     "${prefix}/bin/firecracker"
+mv "${prefix}/bin/jailer-v${version}-${arch}"          "${prefix}/bin/jailer"
+mv "${prefix}/bin/seccompiler-bin-v${version}-${arch}" "${prefix}/bin/seccompiler-bin"
 EOF
diff --git a/tools/firectl/Dockerfile.template b/tools/firectl/Dockerfile.template
@@ -1,14 +1,17 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 
 ARG name
 ARG version
 
 RUN <<EOF
 check-github-release-asset "firecracker-microvm/firectl" "v${version}" "firectl-v${version}"
-curl --silent --location --fail --output "${prefix}${target}/bin/firectl" \
+curl --silent --location --fail --output "${prefix}/bin/firectl" \
     "https://github.com/firecracker-microvm/firectl/releases/download/v${version}/firectl-v${version}"
-chmod +x "${prefix}${target}/bin/firectl"
+chmod +x "${prefix}/bin/firectl"
 EOF
diff --git a/tools/firejail/Dockerfile.template b/tools/firejail/Dockerfile.template
@@ -1,8 +1,10 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b AS build
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 RUN <<EOF
 apt-get update
 apt-get -y install --no-install-recommends \
@@ -16,15 +18,8 @@ ARG name
 ARG version
 RUN <<EOF
 git clone -q --config advice.detachedHead=false --depth 1 --branch "${version}" https://github.com/netblue30/firejail .
-./configure --prefix=/usr/local
+./configure --prefix="${prefix}"
 make
 make install-strip
-mv /usr/local/share/zsh/site-functions /usr/local/share/zsh/vendor-completions
-rm -f /usr/local/man
-rm -f /usr/local/sbin/unminimize
-EOF
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
-ARG name
-ARG version
-COPY --from=build /usr/local/ ${prefix}${target}/
+mv "${prefix}/share/zsh/site-functions" "${prefix}/share/zsh/vendor-completions"
+EOF
diff --git a/tools/flarectl/Dockerfile.template b/tools/flarectl/Dockerfile.template
@@ -1,13 +1,15 @@
 #syntax=docker/dockerfile:1.6.0
 
-ARG ref=main
-
-FROM ghcr.io/uniget-org/tools/base:${ref} AS prepare
+FROM nicholasdille/ubuntu:22.04 AS prepare
+COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \
+    /etc/profile.d/ \
+    /etc/profile.d/
+SHELL [ "bash", "-clo", "errexit" ]
 ARG name
 ARG version
 RUN <<EOF
 check-github-release-asset "cloudflare/cloudflare-go" "v${version}" "flarectl_${version}_linux_${alt_arch}.tar.gz"
 curl --silent --location --fail "https://github.com/cloudflare/cloudflare-go/releases/download/v${version}/flarectl_${version}_linux_${alt_arch}.tar.gz" \
-| tar --extract --gzip --directory="${prefix}${target}/bin/" --no-same-owner \
+| tar --extract --gzip --directory="${prefix}/bin/" --no-same-owner \
     flarectl
 EOF