From df5287f2895476daf03b18a75e9a541c6a8242d4 Mon Sep 17 00:00:00 2001 From: Nicholas Dille Date: Tue, 16 Jul 2024 16:12:00 +0200 Subject: [PATCH 1/2] Bumped uniget-org/images/build-base to 3.20 --- tools/acr/Dockerfile.template | 2 +- tools/axel/Dockerfile.template | 2 +- tools/bubblewrap/Dockerfile.template | 2 +- tools/bypass4netns/Dockerfile.template | 2 +- tools/curl/Dockerfile.template | 2 +- tools/dot/Dockerfile.template | 2 +- tools/firejail/Dockerfile.template | 2 +- tools/git/Dockerfile.template | 2 +- tools/gnuplot/Dockerfile.template | 2 +- tools/graphviz/Dockerfile.template | 2 +- tools/inotify-tools/Dockerfile.template | 2 +- tools/iptables/Dockerfile.template | 2 +- tools/keybase/Dockerfile.template | 2 +- tools/libbpf/Dockerfile.template | 2 +- tools/libcap-ng/Dockerfile.template | 2 +- tools/libcap/Dockerfile.template | 2 +- tools/libcgroup/Dockerfile.template | 2 +- tools/libmnl/Dockerfile.template | 2 +- tools/libnftnl/Dockerfile.template | 2 +- tools/lxroot/Dockerfile.template | 2 +- tools/lz4/Dockerfile.template | 2 +- tools/make/Dockerfile.template | 2 +- tools/nftables/Dockerfile.template | 2 +- tools/nsutils/Dockerfile.template | 2 +- tools/passh/Dockerfile.template | 2 +- tools/passt/Dockerfile.template | 2 +- tools/pigz/Dockerfile.template | 2 +- tools/podman/Dockerfile.template | 2 +- tools/proot/Dockerfile.template | 2 +- tools/pv/Dockerfile.template | 2 +- tools/qrencode/Dockerfile.template | 2 +- tools/reptyr/Dockerfile.template | 2 +- tools/runq/Dockerfile.template | 2 +- tools/socat/Dockerfile.template | 2 +- tools/speex/Dockerfile.template | 2 +- tools/speexdsp/Dockerfile.template | 2 +- tools/su-exec/Dockerfile.template | 2 +- tools/tasker/Dockerfile.template | 2 +- tools/tshark/Dockerfile.template | 2 +- tools/uidmap/Dockerfile.template | 2 +- tools/wg/Dockerfile.template | 2 +- tools/xmlstarlet/Dockerfile.template | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/tools/acr/Dockerfile.template b/tools/acr/Dockerfile.template index 7997c6e9ec..95b00e2767 100644 --- a/tools/acr/Dockerfile.template +++ b/tools/acr/Dockerfile.template @@ -3,7 +3,7 @@ FROM ghcr.io/uniget-org/tools/go:latest AS go FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/axel/Dockerfile.template b/tools/axel/Dockerfile.template index eda90fe711..d5b2e4137c 100644 --- a/tools/axel/Dockerfile.template +++ b/tools/axel/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/bubblewrap/Dockerfile.template b/tools/bubblewrap/Dockerfile.template index 0e31636e45..51e3ec9728 100644 --- a/tools/bubblewrap/Dockerfile.template +++ b/tools/bubblewrap/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/bypass4netns/Dockerfile.template b/tools/bypass4netns/Dockerfile.template index 2a505a1b47..8b83e89641 100644 --- a/tools/bypass4netns/Dockerfile.template +++ b/tools/bypass4netns/Dockerfile.template @@ -3,7 +3,7 @@ FROM ghcr.io/uniget-org/tools/go:latest AS go FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/curl/Dockerfile.template b/tools/curl/Dockerfile.template index 1e72296040..38ffe2a2b6 100644 --- a/tools/curl/Dockerfile.template +++ b/tools/curl/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/dot/Dockerfile.template b/tools/dot/Dockerfile.template index 830411feb3..748c03429f 100644 --- a/tools/dot/Dockerfile.template +++ b/tools/dot/Dockerfile.template @@ -3,7 +3,7 @@ FROM ghcr.io/uniget-org/tools/go:latest AS go FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/firejail/Dockerfile.template b/tools/firejail/Dockerfile.template index 960ef43348..a571512a88 100644 --- a/tools/firejail/Dockerfile.template +++ b/tools/firejail/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/git/Dockerfile.template b/tools/git/Dockerfile.template index 98bc98db7d..540a1e521b 100644 --- a/tools/git/Dockerfile.template +++ b/tools/git/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/gnuplot/Dockerfile.template b/tools/gnuplot/Dockerfile.template index 5d82fc01a7..27c2e10079 100644 --- a/tools/gnuplot/Dockerfile.template +++ b/tools/gnuplot/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/graphviz/Dockerfile.template b/tools/graphviz/Dockerfile.template index 565dea66be..fa72e7234e 100644 --- a/tools/graphviz/Dockerfile.template +++ b/tools/graphviz/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/inotify-tools/Dockerfile.template b/tools/inotify-tools/Dockerfile.template index 76936c6c34..461b2ba25e 100644 --- a/tools/inotify-tools/Dockerfile.template +++ b/tools/inotify-tools/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/iptables/Dockerfile.template b/tools/iptables/Dockerfile.template index 559940e2db..d165f8f945 100644 --- a/tools/iptables/Dockerfile.template +++ b/tools/iptables/Dockerfile.template @@ -4,7 +4,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/libmnl:latest AS libmnl FROM ghcr.io/uniget-org/tools/libnftnl:latest AS libnftnl -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/keybase/Dockerfile.template b/tools/keybase/Dockerfile.template index 269831a864..57916dffa5 100644 --- a/tools/keybase/Dockerfile.template +++ b/tools/keybase/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/go:latest AS go -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/libbpf/Dockerfile.template b/tools/libbpf/Dockerfile.template index 19dd351f96..c12e29c2fa 100644 --- a/tools/libbpf/Dockerfile.template +++ b/tools/libbpf/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/libcap-ng/Dockerfile.template b/tools/libcap-ng/Dockerfile.template index 0cde080294..428d47128d 100644 --- a/tools/libcap-ng/Dockerfile.template +++ b/tools/libcap-ng/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/libcap/Dockerfile.template b/tools/libcap/Dockerfile.template index 4772260ae6..2b321d7d05 100644 --- a/tools/libcap/Dockerfile.template +++ b/tools/libcap/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/libcgroup/Dockerfile.template b/tools/libcgroup/Dockerfile.template index 0356222c56..11adbc2f5b 100644 --- a/tools/libcgroup/Dockerfile.template +++ b/tools/libcgroup/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/libmnl/Dockerfile.template b/tools/libmnl/Dockerfile.template index 5a8f41d2ca..3faf2b8411 100644 --- a/tools/libmnl/Dockerfile.template +++ b/tools/libmnl/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/libnftnl/Dockerfile.template b/tools/libnftnl/Dockerfile.template index 406aafe5ac..5d5fcd1ba1 100644 --- a/tools/libnftnl/Dockerfile.template +++ b/tools/libnftnl/Dockerfile.template @@ -3,7 +3,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/libmnl:latest AS libmnl -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/lxroot/Dockerfile.template b/tools/lxroot/Dockerfile.template index ce34572369..0f02f1c63c 100644 --- a/tools/lxroot/Dockerfile.template +++ b/tools/lxroot/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/lz4/Dockerfile.template b/tools/lz4/Dockerfile.template index 34a4579b2f..8b3c003856 100644 --- a/tools/lz4/Dockerfile.template +++ b/tools/lz4/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/make/Dockerfile.template b/tools/make/Dockerfile.template index 130ca0519c..71d1163a55 100644 --- a/tools/make/Dockerfile.template +++ b/tools/make/Dockerfile.template @@ -1,6 +1,6 @@ #syntax=docker/dockerfile:1.9.0@sha256:fe40cf4e92cd0c467be2cfc30657a680ae2398318afd50b0c80585784c604f28 -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/nftables/Dockerfile.template b/tools/nftables/Dockerfile.template index 05c54f8ceb..cdf7582cee 100644 --- a/tools/nftables/Dockerfile.template +++ b/tools/nftables/Dockerfile.template @@ -4,7 +4,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/libmnl:latest AS libmnl FROM ghcr.io/uniget-org/tools/libnftnl:latest AS libnftnl -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/nsutils/Dockerfile.template b/tools/nsutils/Dockerfile.template index f68cc625a9..2664b7056e 100644 --- a/tools/nsutils/Dockerfile.template +++ b/tools/nsutils/Dockerfile.template @@ -3,7 +3,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/libcap:latest AS libcap -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/passh/Dockerfile.template b/tools/passh/Dockerfile.template index 1f0fb0faff..98e00d55d5 100644 --- a/tools/passh/Dockerfile.template +++ b/tools/passh/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/passt/Dockerfile.template b/tools/passt/Dockerfile.template index 88cb2a08a2..6aa46bbe42 100644 --- a/tools/passt/Dockerfile.template +++ b/tools/passt/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/pigz/Dockerfile.template b/tools/pigz/Dockerfile.template index 0664d91b0e..b9587c6124 100644 --- a/tools/pigz/Dockerfile.template +++ b/tools/pigz/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/podman/Dockerfile.template b/tools/podman/Dockerfile.template index a74ad3747d..85ca1b1471 100644 --- a/tools/podman/Dockerfile.template +++ b/tools/podman/Dockerfile.template @@ -5,7 +5,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/go-md2man:latest AS go-md2man FROM ghcr.io/uniget-org/tools/cni:latest AS cni -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/proot/Dockerfile.template b/tools/proot/Dockerfile.template index ce5af64460..b11eb86792 100644 --- a/tools/proot/Dockerfile.template +++ b/tools/proot/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/pv/Dockerfile.template b/tools/pv/Dockerfile.template index a49a5dfaa7..ffe975f95f 100644 --- a/tools/pv/Dockerfile.template +++ b/tools/pv/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/qrencode/Dockerfile.template b/tools/qrencode/Dockerfile.template index 32a713716a..c597b2bfaf 100644 --- a/tools/qrencode/Dockerfile.template +++ b/tools/qrencode/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/reptyr/Dockerfile.template b/tools/reptyr/Dockerfile.template index 2b6a261a42..293521f0a8 100644 --- a/tools/reptyr/Dockerfile.template +++ b/tools/reptyr/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/runq/Dockerfile.template b/tools/runq/Dockerfile.template index c53fcdfeaf..5f29ecd648 100644 --- a/tools/runq/Dockerfile.template +++ b/tools/runq/Dockerfile.template @@ -4,7 +4,7 @@ FROM ghcr.io/uniget-org/tools/go:latest AS go FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/tini:main AS tini -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/socat/Dockerfile.template b/tools/socat/Dockerfile.template index 36ebdf394e..658429f820 100644 --- a/tools/socat/Dockerfile.template +++ b/tools/socat/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/speex/Dockerfile.template b/tools/speex/Dockerfile.template index e6221dcd87..d4980339c9 100644 --- a/tools/speex/Dockerfile.template +++ b/tools/speex/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/speexdsp/Dockerfile.template b/tools/speexdsp/Dockerfile.template index 0ea5caf2c0..040a0f994c 100644 --- a/tools/speexdsp/Dockerfile.template +++ b/tools/speexdsp/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/su-exec/Dockerfile.template b/tools/su-exec/Dockerfile.template index 3718f172c8..0283106fe4 100644 --- a/tools/su-exec/Dockerfile.template +++ b/tools/su-exec/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/tasker/Dockerfile.template b/tools/tasker/Dockerfile.template index caa1835f4c..549164f3e5 100644 --- a/tools/tasker/Dockerfile.template +++ b/tools/tasker/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/tshark/Dockerfile.template b/tools/tshark/Dockerfile.template index f3cf13df09..fd5d716fcb 100644 --- a/tools/tshark/Dockerfile.template +++ b/tools/tshark/Dockerfile.template @@ -3,7 +3,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make FROM ghcr.io/uniget-org/tools/speexdsp:latest AS speexdsp -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/uidmap/Dockerfile.template b/tools/uidmap/Dockerfile.template index 92047712ad..ee85edfafa 100644 --- a/tools/uidmap/Dockerfile.template +++ b/tools/uidmap/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/wg/Dockerfile.template b/tools/wg/Dockerfile.template index bb34256be4..be176ace2d 100644 --- a/tools/wg/Dockerfile.template +++ b/tools/wg/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ diff --git a/tools/xmlstarlet/Dockerfile.template b/tools/xmlstarlet/Dockerfile.template index 56eec307b5..438ec473f3 100644 --- a/tools/xmlstarlet/Dockerfile.template +++ b/tools/xmlstarlet/Dockerfile.template @@ -2,7 +2,7 @@ FROM ghcr.io/uniget-org/tools/make:latest AS make -FROM ghcr.io/uniget-org/images/build-base:3.19 AS prepare +FROM ghcr.io/uniget-org/images/build-base:3.20 AS prepare COPY --from=ghcr.io/uniget-org/tools/uniget-build:latest \ /etc/profile.d/ \ /etc/profile.d/ From 3c4891a172dc6b9d45270e2ef70dfd30059f683d Mon Sep 17 00:00:00 2001 From: Nicholas Dille Date: Wed, 17 Jul 2024 08:33:54 +0200 Subject: [PATCH 2/2] Fixed dependencies --- tools/speex/manifest.yaml | 2 +- tools/speexdsp/manifest.yaml | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/speex/manifest.yaml b/tools/speex/manifest.yaml index 8766700e23..b26831bd74 100644 --- a/tools/speex/manifest.yaml +++ b/tools/speex/manifest.yaml @@ -8,7 +8,7 @@ build_dependencies: - make platforms: - linux/amd64 -#- linux/arm64 +- linux/arm64 tags: - category/development - lang/c diff --git a/tools/speexdsp/manifest.yaml b/tools/speexdsp/manifest.yaml index 51c3c432bc..1336bd7961 100644 --- a/tools/speexdsp/manifest.yaml +++ b/tools/speexdsp/manifest.yaml @@ -4,13 +4,9 @@ name: speexdsp version: "1.2.1" binary: "false" check: "" -build_dependencies: -- bar -runtime_dependencies: -- baz platforms: - linux/amd64 -#- linux/arm64 +- linux/arm64 tags: - category/development - lang/c