mirror of
https://github.com/siderolabs/talos.git
synced 2026-05-05 20:36:18 +02:00
fix: drop libseccomp from rootfs
`containerd` doesn't need it, and `runc` is statically linked. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
parent
f74a805bb0
commit
ae87edffbc
@ -38,7 +38,6 @@ ARG PKG_LIBLZMA=scratch
|
||||
ARG PKG_LIBMNL=scratch
|
||||
ARG PKG_LIBNFTNL=scratch
|
||||
ARG PKG_LIBPOPT=scratch
|
||||
ARG PKG_LIBSECCOMP=scratch
|
||||
ARG PKG_LIBSELINUX=scratch
|
||||
ARG PKG_LIBSEPOL=scratch
|
||||
ARG PKG_LIBURCU=scratch
|
||||
@ -139,9 +138,6 @@ FROM --platform=arm64 ${PKG_PCRE2} AS pkg-pcre2-arm64
|
||||
FROM --platform=amd64 ${PKG_OPENSSL} AS pkg-openssl-amd64
|
||||
FROM --platform=arm64 ${PKG_OPENSSL} AS pkg-openssl-arm64
|
||||
|
||||
FROM --platform=amd64 ${PKG_LIBSECCOMP} AS pkg-libseccomp-amd64
|
||||
FROM --platform=arm64 ${PKG_LIBSECCOMP} AS pkg-libseccomp-arm64
|
||||
|
||||
# linux-firmware is not arch-specific
|
||||
FROM --platform=amd64 ${PKG_LINUX_FIRMWARE} AS pkg-linux-firmware
|
||||
|
||||
@ -738,7 +734,6 @@ COPY --link --from=pkg-libsepol-amd64 / /rootfs
|
||||
COPY --link --from=pkg-libselinux-amd64 / /rootfs
|
||||
COPY --link --from=pkg-pcre2-amd64 / /rootfs
|
||||
COPY --link --from=pkg-openssl-amd64 / /rootfs
|
||||
COPY --link --from=pkg-libseccomp-amd64 / /rootfs
|
||||
COPY --link --from=pkg-lvm2-amd64 / /rootfs
|
||||
COPY --link --from=pkg-libaio-amd64 / /rootfs
|
||||
COPY --link --from=pkg-musl-amd64 / /rootfs
|
||||
@ -816,7 +811,6 @@ COPY --link --from=pkg-libsepol-arm64 / /rootfs
|
||||
COPY --link --from=pkg-libselinux-arm64 / /rootfs
|
||||
COPY --link --from=pkg-pcre2-arm64 / /rootfs
|
||||
COPY --link --from=pkg-openssl-arm64 / /rootfs
|
||||
COPY --link --from=pkg-libseccomp-arm64 / /rootfs
|
||||
COPY --link --from=pkg-lvm2-arm64 / /rootfs
|
||||
COPY --link --from=pkg-libaio-arm64 / /rootfs
|
||||
COPY --link --from=pkg-musl-arm64 / /rootfs
|
||||
|
||||
2
Makefile
2
Makefile
@ -60,7 +60,6 @@ PKG_LIBLZMA ?= $(PKGS_PREFIX)/liblzma:$(PKGS)
|
||||
PKG_LIBMNL ?= $(PKGS_PREFIX)/libmnl:$(PKGS)
|
||||
PKG_LIBNFTNL ?= $(PKGS_PREFIX)/libnftnl:$(PKGS)
|
||||
PKG_LIBPOPT ?= $(PKGS_PREFIX)/libpopt:$(PKGS)
|
||||
PKG_LIBSECCOMP ?= $(PKGS_PREFIX)/libseccomp:$(PKGS)
|
||||
PKG_LIBSELINUX ?= $(PKGS_PREFIX)/libselinux:$(PKGS)
|
||||
PKG_LIBSEPOL ?= $(PKGS_PREFIX)/libsepol:$(PKGS)
|
||||
PKG_LIBURCU ?= $(PKGS_PREFIX)/liburcu:$(PKGS)
|
||||
@ -242,7 +241,6 @@ COMMON_ARGS += --build-arg=PKG_LIBLZMA=$(PKG_LIBLZMA)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBMNL=$(PKG_LIBMNL)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBNFTNL=$(PKG_LIBNFTNL)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBPOPT=$(PKG_LIBPOPT)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBSECCOMP=$(PKG_LIBSECCOMP)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBSELINUX=$(PKG_LIBSELINUX)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBSEPOL=$(PKG_LIBSEPOL)
|
||||
COMMON_ARGS += --build-arg=PKG_LIBURCU=$(PKG_LIBURCU)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user