diff --git a/eve-tools/bpftrace-compiler/root/Dockerfile b/eve-tools/bpftrace-compiler/root/Dockerfile index e64973b8541..494f7864c91 100644 --- a/eve-tools/bpftrace-compiler/root/Dockerfile +++ b/eve-tools/bpftrace-compiler/root/Dockerfile @@ -5,9 +5,9 @@ ARG EVE_KERNEL # hadolint ignore=DL3006 FROM ${EVE_KERNEL} AS kernel -FROM lfedge/eve-bpftrace:64f87b9dfce42524b0364159a6cc3b88ae3445b2 AS eve-bpftrace +FROM lfedge/eve-bpftrace:49b22c5e0daaf4e380fa18ffafdba7cfbdfb9f43 AS eve-bpftrace -FROM lfedge/eve-alpine:0f2e0da38e30753c68410727a6cc269e57ff74f2 AS bpftrace +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS bpftrace # hadolint ignore=DL3018 RUN apk add --no-cache --initdb make gcc g++ git perl musl-dev cmake zlib-dev bcc-dev libbpf-dev cereal flex bison llvm13-libs llvm13-dev llvm13-static clang-dev clang-static pahole gtest-dev bash diff --git a/pkg/acrn-kernel/Dockerfile b/pkg/acrn-kernel/Dockerfile index b86320543d9..ca851e339bd 100644 --- a/pkg/acrn-kernel/Dockerfile +++ b/pkg/acrn-kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS kernel-build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS kernel-build ENV BUILD_PKGS \ argp-standalone automake bash bc binutils-dev bison build-base \ diff --git a/pkg/acrn/Dockerfile b/pkg/acrn/Dockerfile index 2a2ef41f63c..ce6d7408114 100644 --- a/pkg/acrn/Dockerfile +++ b/pkg/acrn/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS kernel-build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS kernel-build ENV BUILD_PKGS \ gcc make libc-dev dev86 xz-dev perl bash python3-dev gettext iasl \ diff --git a/pkg/alpine/Dockerfile b/pkg/alpine/Dockerfile index a04fb9b4e4b..f4bc3fd5369 100644 --- a/pkg/alpine/Dockerfile +++ b/pkg/alpine/Dockerfile @@ -27,6 +27,12 @@ RUN apk add --no-cache abuild gcc sudo # hadolint ignore=DL3059 RUN abuild-keygen -a -i -n +# Alpine 3.16 no longer receives CA bundle updates. Rebuild the current +# certificate data against this branch's libraries instead of upgrading Alpine. +COPY ca-certificates /tmp/ca-backport/main/ca-certificates/ +WORKDIR /tmp/ca-backport/main/ca-certificates +RUN abuild -F -P /tmp/ca-packages -r + # create all the mirrors WORKDIR /tmp/mirrors RUN [ -f /etc/apk/repositories.upstream ] || mv /etc/apk/repositories /etc/apk/repositories.upstream diff --git a/pkg/alpine/build-cache.sh b/pkg/alpine/build-cache.sh index db520509eb9..5388a0716a8 100755 --- a/pkg/alpine/build-cache.sh +++ b/pkg/alpine/build-cache.sh @@ -37,6 +37,15 @@ if [ -n "$PKGS" ]; then apk fetch -X "$ALPINE_REPO" --no-cache -o "$CACHE" $PKGS fi +# Replace cached CA packages, including copies fetched as dependencies. +# Refreshing only the cache image leaves the obsolete 3.16 packages in place. +for p in ca-certificates ca-certificates-bundle; do + if ls "$CACHE/${p}"-[0-9]*.apk >/dev/null 2>&1; then + rm -f "$CACHE/${p}"-[0-9]*.apk + cp /tmp/ca-packages/main/"$(apk --print-arch)"/"${p}"-[0-9]*.apk "$CACHE/" + fi +done + # index the cache rm -f "$CACHE"/APKINDEX* apk index --rewrite-arch "$(apk --print-arch)" -o "$CACHE/APKINDEX.unsigned.tar.gz" "$CACHE"/*.apk diff --git a/pkg/alpine/ca-certificates/APKBUILD b/pkg/alpine/ca-certificates/APKBUILD new file mode 100644 index 00000000000..16f61aa5d34 --- /dev/null +++ b/pkg/alpine/ca-certificates/APKBUILD @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: MIT +# Adapted from Alpine aports 3.16-stable/main/ca-certificates for EVE. +# Contributor: Sören Tempel +# Maintainer: Natanael Copa +pkgname=ca-certificates +pkgver=20261020 +pkgrel=0 +pkgdesc="Common CA certificates PEM files from Mozilla" +url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" +arch="all" +# There is a GPL-2.0-or-later script inside the source but it is not shipped +license="MPL-2.0 AND MIT" +makedepends_build="perl" +makedepends_host="openssl-dev" +subpackages="$pkgname-doc $pkgname-bundle::noarch" +# c_rehash is either in libcrypto1.0 or openssl depending on package, grr. replace both of them +replaces="libcrypto1.0 openssl openssl1.0" +options="!fhs !check" +triggers="ca-certificates.trigger=/usr/share/ca-certificates:/usr/local/share/ca-certificates:/etc/ssl/certs:/etc/ca-certificates/update.d" +install="$pkgname.post-deinstall" +source="https://distfiles.alpinelinux.org/distfiles/v3.22/ca-certificates-$pkgver.tar.bz2" + +build() { + make +} + +package() { + make install DESTDIR="$pkgdir" + + ( + echo "# Automatically generated by $pkgname-$pkgver-r$pkgrel" + echo "# $(date -u)" + echo "# Do not edit." + cd "$pkgdir"/usr/share/ca-certificates + find . -name '*.crt' | sort | cut -b3- + ) > "$pkgdir"/etc/ca-certificates.conf + + # generate the bundle in similar way as update-ca-certificates would do + find -- *.crt | sort | while read -r i; do + cat "$i" + printf "\n" + done > "$pkgdir"/etc/ssl/certs/ca-certificates.crt + + mkdir -p "$pkgdir"/etc/apk/protected_paths.d + cat > "$pkgdir"/etc/apk/protected_paths.d/ca-certificates.list < "$pkgdir"/etc/ca-certificates/update.d/certhash </dev/null || true diff --git a/pkg/alpine/ca-certificates/ca-certificates.trigger b/pkg/alpine/ca-certificates/ca-certificates.trigger new file mode 100755 index 00000000000..4bcf846560a --- /dev/null +++ b/pkg/alpine/ca-certificates/ca-certificates.trigger @@ -0,0 +1,4 @@ +#!/bin/sh +# SPDX-License-Identifier: MIT +/usr/sbin/update-ca-certificates --fresh >/dev/null 2>&1 +exit 0 diff --git a/pkg/apparmor/Dockerfile b/pkg/apparmor/Dockerfile index 146b7ed7a71..d068575e195 100644 --- a/pkg/apparmor/Dockerfile +++ b/pkg/apparmor/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS linux-headers musl-dev musl-utils musl-libintl git gcc g++ \ autoconf automake libtool make flex bison bash sed gettext ENV PKGS alpine-baselayout diff --git a/pkg/bpftrace/Dockerfile b/pkg/bpftrace/Dockerfile index ccfb478780e..1d15ce1cf2d 100644 --- a/pkg/bpftrace/Dockerfile +++ b/pkg/bpftrace/Dockerfile @@ -2,7 +2,7 @@ # Copyright (c) 2024 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS make gcc g++ git perl linux-headers musl-dev cmake zlib-dev bcc-dev libbpf-dev cereal flex bison llvm13-libs llvm13-dev llvm13-static clang-dev clang-static pahole gtest-dev bash diff --git a/pkg/bsp-imx/Dockerfile b/pkg/bsp-imx/Dockerfile index 62e7c0f65d9..b820820eee9 100644 --- a/pkg/bsp-imx/Dockerfile +++ b/pkg/bsp-imx/Dockerfile @@ -4,10 +4,10 @@ ARG BUILD_PKGS_BASE="bash binutils-dev build-base bc bison flex openssl-dev util-linux-dev swig gnutls-dev perl python3 python3-dev py3-setuptools py3-pycryptodome py3-elftools" # we use the same image in several places -ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 +ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 # OPTEE-OS images -FROM lfedge/eve-optee-os:f3ce61f96081d93d10af4565c057f73f0490a291 AS optee-os +FROM lfedge/eve-optee-os:9823033d4c4168781e6ef4202a7de050c345863d AS optee-os # hadolint ignore=DL3006 FROM ${EVE_ALPINE_IMAGE} as build-native @@ -20,7 +20,7 @@ ARG BUILD_PKGS_BASE RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh # hadolint ignore=DL3029 -FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:a11aaaaf4a01ba7f05c4ca1e527911f4846b3de8 AS cross-compilers +FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:384f40eb85fc07443bfbf74e254eef5c887c09d9 AS cross-compilers # will use several packages from target arch and copy them to sysroot # hadolint ignore=DL3006 diff --git a/pkg/cross-compilers/Dockerfile b/pkg/cross-compilers/Dockerfile index a62fc20db43..48656a52cf0 100644 --- a/pkg/cross-compilers/Dockerfile +++ b/pkg/cross-compilers/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build-base +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build-base ENV BUILD_PKGS abuild curl tar make linux-headers patch g++ git gcc ncurses-dev autoconf file sudo RUN eve-alpine-deploy.sh @@ -45,7 +45,7 @@ FROM build-base as build-armhf # we do not support cross-compilers for riscv64 host # as gcc-gnat is not available on riscv64 # we cannot build cross-compilers without additional patches -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build-riscv64 +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build-riscv64 # hadolint ignore=DL3006 FROM build-${TARGETARCH} as build diff --git a/pkg/debug/Dockerfile b/pkg/debug/Dockerfile index 3b5835b18b0..aa3cbb5d67c 100644 --- a/pkg/debug/Dockerfile +++ b/pkg/debug/Dockerfile @@ -8,9 +8,9 @@ # has a fast path for stack unwinding. This also happens # to be a perfect place to put any other kind of debug info # into the package: see abuild/etc/abuild.conf. -FROM lfedge/eve-recovertpm:717bec1554574f1126f85c967856e45def035a03 AS recovertpm -FROM lfedge/eve-bpftrace:e249c9161da62cf69851bf2cfc5f14109f8dd55d AS bpftrace -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-recovertpm:827a0328180abf4cb365c3d375e6a89a76ddcb39 AS recovertpm +FROM lfedge/eve-bpftrace:49b22c5e0daaf4e380fa18ffafdba7cfbdfb9f43 AS bpftrace +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS="abuild curl tar make linux-headers patch g++ git gcc gpg ncurses-dev autoconf openssl-dev zlib-dev jq pciutils usbutils lsblk" # Feel free to add additional packages here, but be aware that # EVE's rootfs image can be no larger than 300Mb (and don't diff --git a/pkg/debug/Dockerfile.spec b/pkg/debug/Dockerfile.spec index be215360ee8..76bdd1ebb69 100644 --- a/pkg/debug/Dockerfile.spec +++ b/pkg/debug/Dockerfile.spec @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:745ae9066273c73b0fd879c4ba4ff626a8392d04 +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 ENV BUILD_PKGS="jq pciutils usbutils lsblk" diff --git a/pkg/dnsmasq/Dockerfile b/pkg/dnsmasq/Dockerfile index 9095ee5daed..838a8104c5e 100644 --- a/pkg/dnsmasq/Dockerfile +++ b/pkg/dnsmasq/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) 2025 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS gcc make patch libc-dev linux-headers tar xz coreutils RUN eve-alpine-deploy.sh diff --git a/pkg/dom0-ztools/Dockerfile b/pkg/dom0-ztools/Dockerfile index b985f691d6b..8bdf8fe7a64 100644 --- a/pkg/dom0-ztools/Dockerfile +++ b/pkg/dom0-ztools/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile-upstream:1.5.0-rc2-labs -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as zfs +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as zfs ENV BUILD_PKGS git patch ca-certificates util-linux build-base gettext-dev libtirpc-dev automake autoconf \ libtool linux-headers attr-dev e2fsprogs-dev glib-dev openssl-dev util-linux-dev coreutils ENV PKGS ca-certificates util-linux libintl libuuid libtirpc libblkid libcrypto1.1 zlib diff --git a/pkg/edgeview/Dockerfile b/pkg/edgeview/Dockerfile index d33cb694a00..93b4ff27a74 100644 --- a/pkg/edgeview/Dockerfile +++ b/pkg/edgeview/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS git ENV PKGS alpine-baselayout musl-utils iproute2 iptables RUN eve-alpine-deploy.sh diff --git a/pkg/eve/Dockerfile.in b/pkg/eve/Dockerfile.in index 5baf1d3a63b..39aca139e4d 100644 --- a/pkg/eve/Dockerfile.in +++ b/pkg/eve/Dockerfile.in @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as tools +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as tools ENV PKGS qemu-img tar u-boot-tools coreutils dosfstools RUN eve-alpine-deploy.sh diff --git a/pkg/fscrypt/Dockerfile b/pkg/fscrypt/Dockerfile index 0ec58b42053..427a72ca84e 100644 --- a/pkg/fscrypt/Dockerfile +++ b/pkg/fscrypt/Dockerfile @@ -2,7 +2,7 @@ # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build-base +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build-base FROM build-base AS build-amd64 FROM build-base AS build-arm64 diff --git a/pkg/fw/Dockerfile b/pkg/fw/Dockerfile index b896e488e8c..4cacdc452e2 100644 --- a/pkg/fw/Dockerfile +++ b/pkg/fw/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile-upstream:1.5.0-rc2-labs ARG PLATFORM=generic -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build-base +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build-base ENV BUILD_PKGS tar make binutils zstd rdfind coreutils RUN eve-alpine-deploy.sh @@ -84,7 +84,7 @@ ADD https://hailo-hailort.s3.eu-west-2.amazonaws.com/Hailo8/${HAILO_FW_VERSION}/ # generate initrd for Intel's and AMD's microcode # it makes sense only for x86_64 platform -FROM --platform=${TARGETPLATFORM} lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as ucode-build-common +FROM --platform=${TARGETPLATFORM} lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as ucode-build-common RUN mkdir -p /boot /tmp/ucode/intel /tmp/ucode/amd /usr/share/licenses/ucode FROM ucode-build-common as ucode-build-amd64 @@ -125,7 +125,7 @@ FROM ucode-build-common as ucode-build-arm64 FROM ucode-build-common as ucode-build-riscv64 FROM ucode-build-${TARGETARCH} as ucode-build -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as compactor +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as compactor ENTRYPOINT [] WORKDIR / COPY --from=build /lib/firmware/regulatory* /lib/firmware/ diff --git a/pkg/gpt-tools/Dockerfile b/pkg/gpt-tools/Dockerfile index 1de4aa651c2..a8ecd2333ef 100644 --- a/pkg/gpt-tools/Dockerfile +++ b/pkg/gpt-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS gcc make file patch libc-dev util-linux-dev linux-headers openssl-dev g++ tar RUN eve-alpine-deploy.sh diff --git a/pkg/grub/Dockerfile b/pkg/grub/Dockerfile index cbc2f87d741..3471db851e3 100644 --- a/pkg/grub/Dockerfile +++ b/pkg/grub/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2025-2026 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as grub-build-base +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as grub-build-base ENV BUILD_PKGS automake \ make \ bison \ diff --git a/pkg/guacd/Dockerfile b/pkg/guacd/Dockerfile index 988e41adf73..73e2c70b325 100644 --- a/pkg/guacd/Dockerfile +++ b/pkg/guacd/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS cairo-dev jpeg-dev libpng-dev gcc make libc-dev openssl-dev libvncserver-dev file patch ENV PKGS alpine-baselayout musl-utils libtasn1-progs p11-kit cairo jpeg libpng libvncserver RUN eve-alpine-deploy.sh diff --git a/pkg/installer/Dockerfile b/pkg/installer/Dockerfile index 3efd1bbc6f1..0024330ffe7 100644 --- a/pkg/installer/Dockerfile +++ b/pkg/installer/Dockerfile @@ -28,10 +28,10 @@ RUN cargo sbom > sbom.spdx.json RUN cp "/usr/local/my-installer/target/$CARGO_BUILD_TARGET/release/installer" /usr/local/my-installer/target/installer -FROM lfedge/eve-debug:4c04c9131f3e456f8d26993613e624f9b5f92eac AS debug +FROM lfedge/eve-debug:af7a7a8cdff0484023ce2eb61d670a318a96564c AS debug # Dockerfile to build installer img initrd -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ENV BUILD_PKGS mkinitfs grep patch make coreutils musl-dev gcc g++ perl \ autoconf automake libtool file bsd-compat-headers libc-dev \ diff --git a/pkg/ipxe/Dockerfile b/pkg/ipxe/Dockerfile index caec7ffe79e..143dac6ce7a 100644 --- a/pkg/ipxe/Dockerfile +++ b/pkg/ipxe/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS="patch make gcc perl util-linux-dev git mtools linux-headers musl-dev xz-dev" RUN eve-alpine-deploy.sh diff --git a/pkg/kdump/Dockerfile b/pkg/kdump/Dockerfile index fc026fad728..c3eef0ebbdb 100644 --- a/pkg/kdump/Dockerfile +++ b/pkg/kdump/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS patch curl make gcc perl util-linux-dev git mtools linux-headers musl-dev xz-dev elfutils-dev libbz2 ENV PKGS xz-libs elfutils-dev libbz2 diff --git a/pkg/kexec/Dockerfile b/pkg/kexec/Dockerfile index 8ba8bb92021..5e365ce981a 100644 --- a/pkg/kexec/Dockerfile +++ b/pkg/kexec/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS patch curl make gcc perl util-linux-dev git mtools linux-headers musl-dev xz-dev elfutils-dev libbz2 ENV PKGS xz-libs util-linux elfutils-dev libbz2 diff --git a/pkg/kube/Dockerfile b/pkg/kube/Dockerfile index 1cfc1212a0a..7a52fa8c7b7 100644 --- a/pkg/kube/Dockerfile +++ b/pkg/kube/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile-upstream:1.5.0-rc2-labs -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV PKGS alpine-baselayout musl-utils iproute2 iptables curl openrc \ open-iscsi libvirt libvirt-client util-linux grep findutils jq \ cni-plugins nfs-utils diff --git a/pkg/kvm-tools/Dockerfile b/pkg/kvm-tools/Dockerfile index 92de25e816f..9a56f043e8c 100644 --- a/pkg/kvm-tools/Dockerfile +++ b/pkg/kvm-tools/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build # Building qemu in strip-down mirovm only mode: # qemu 5.1 dependencies: python3 glib-dev pixman-dev # qemu 5.2+ dependencies: py3-setuptools bash perl diff --git a/pkg/measure-config/Dockerfile b/pkg/measure-config/Dockerfile index 879bf35014f..5cdcb016c0b 100644 --- a/pkg/measure-config/Dockerfile +++ b/pkg/measure-config/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS git ENV PKGS alpine-baselayout musl-utils RUN eve-alpine-deploy.sh diff --git a/pkg/memory-monitor/Dockerfile b/pkg/memory-monitor/Dockerfile index 8a52013fb61..194b5db3df7 100644 --- a/pkg/memory-monitor/Dockerfile +++ b/pkg/memory-monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as memory-monitor-build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as memory-monitor-build ENV BUILD_PKGS gcc musl-dev make linux-headers cmake build-base ENV PKGS alpine-baselayout curl strace diff --git a/pkg/mkconf/Dockerfile b/pkg/mkconf/Dockerfile index 096acaa4ed7..1837dfd9a8a 100644 --- a/pkg/mkconf/Dockerfile +++ b/pkg/mkconf/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV PKGS mtools dosfstools RUN eve-alpine-deploy.sh diff --git a/pkg/mkimage-iso-efi/Dockerfile b/pkg/mkimage-iso-efi/Dockerfile index 28d968919fd..22cbdba7d01 100644 --- a/pkg/mkimage-iso-efi/Dockerfile +++ b/pkg/mkimage-iso-efi/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV PKGS dosfstools libarchive-tools binutils mtools xorriso mkinitfs squashfs-tools RUN eve-alpine-deploy.sh diff --git a/pkg/mkimage-raw-efi/Dockerfile b/pkg/mkimage-raw-efi/Dockerfile index b4dab7068ad..3747f0a2344 100644 --- a/pkg/mkimage-raw-efi/Dockerfile +++ b/pkg/mkimage-raw-efi/Dockerfile @@ -5,7 +5,7 @@ # /EFI/BOOT/grub.cfg - Chainloads main bootloader # /UsbInvocationScript.txt - Enables USB boot on Dell 3000 series # -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ENV BUILD_PKGS grep patch git make gcc linux-headers musl-dev autoconf automake pkgconfig kmod-dev util-linux-dev cryptsetup-dev lddtree libgcc mkinitfs ENV PKGS mtools dosfstools libarchive-tools sgdisk e2fsprogs util-linux squashfs-tools coreutils tar dmidecode \ diff --git a/pkg/mkrootfs-ext4/Dockerfile b/pkg/mkrootfs-ext4/Dockerfile index 6a285f9cfdb..ede03731fe1 100644 --- a/pkg/mkrootfs-ext4/Dockerfile +++ b/pkg/mkrootfs-ext4/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV PKGS dosfstools libarchive-tools binutils mtools sfdisk sgdisk xfsprogs \ e2fsprogs util-linux coreutils multipath-tools squashfs-tools diff --git a/pkg/mkrootfs-squash/Dockerfile b/pkg/mkrootfs-squash/Dockerfile index 4f69997dbae..673bfa150d3 100644 --- a/pkg/mkrootfs-squash/Dockerfile +++ b/pkg/mkrootfs-squash/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV PKGS dosfstools libarchive-tools binutils mtools sfdisk sgdisk \ xfsprogs e2fsprogs util-linux coreutils multipath-tools squashfs-tools diff --git a/pkg/monitor/Dockerfile b/pkg/monitor/Dockerfile index dc01c6ccc22..5190ee5d628 100644 --- a/pkg/monitor/Dockerfile +++ b/pkg/monitor/Dockerfile @@ -49,7 +49,7 @@ RUN cargo sbom > sbom.spdx.json RUN cp /app/target/$CARGO_BUILD_TARGET/release/monitor /app/target/ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS runtime +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS runtime ENV PKGS="kbd pciutils usbutils" RUN eve-alpine-deploy.sh diff --git a/pkg/newlog/Dockerfile b/pkg/newlog/Dockerfile index 984d3bc44b1..fbdaf4a1b65 100644 --- a/pkg/newlog/Dockerfile +++ b/pkg/newlog/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS git ENV PKGS coreutils RUN eve-alpine-deploy.sh diff --git a/pkg/nvidia/Dockerfile b/pkg/nvidia/Dockerfile index 43223877ae3..4e6c330e3f1 100644 --- a/pkg/nvidia/Dockerfile +++ b/pkg/nvidia/Dockerfile @@ -5,7 +5,7 @@ ARG PLATFORM=generic -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build-base +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build-base ENV BUILD_PKGS="autoconf automake build-base coreutils gettext git glib-dev libtool libmd-dev ncurses-dev tar xz-dev yq zstd-dev" RUN eve-alpine-deploy.sh diff --git a/pkg/optee-os/Dockerfile b/pkg/optee-os/Dockerfile index c16c2013e30..e627893e035 100644 --- a/pkg/optee-os/Dockerfile +++ b/pkg/optee-os/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_PKGS_BASE="autoconf automake bash binutils binutils-dev build-base bc bison curl dtc expat flex openssl-dev util-linux-dev swig gnutls-dev perl python3 python3-dev py3-setuptools py3-pycryptodome py3-elftools py3-cryptography" # we use the same image in several places -ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 +ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 # hadolint ignore=DL3006 FROM ${EVE_ALPINE_IMAGE} as build-native @@ -17,7 +17,7 @@ ARG BUILD_PKGS_BASE RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh # hadolint ignore=DL3029 -FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:a11aaaaf4a01ba7f05c4ca1e527911f4846b3de8 AS cross-compilers +FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:384f40eb85fc07443bfbf74e254eef5c887c09d9 AS cross-compilers # will use several packages from target arch and copy them to sysroot # hadolint ignore=DL3006 diff --git a/pkg/pillar/Dockerfile b/pkg/pillar/Dockerfile index 35d0e0857ce..27db34b4db1 100644 --- a/pkg/pillar/Dockerfile +++ b/pkg/pillar/Dockerfile @@ -8,10 +8,10 @@ ARG BUILD_PKGS_BASE="git gcc linux-headers libc-dev make linux-pam-dev m4 findut libintl libuuid libtirpc libblkid libcrypto1.1 zlib tar" # we use the same image in several places -ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 +ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 -FROM lfedge/eve-uefi:0813a2a0bc6eb92446346210070cf5e6b3cb9682 as uefi-build -FROM lfedge/eve-dom0-ztools:1d83564a1f068cffe472a8c8608c3eb39c6c97e2 as zfs +FROM lfedge/eve-uefi:cf30752ba2c056ff0466e26747e8e61d0b643107 as uefi-build +FROM lfedge/eve-dom0-ztools:fbe729f942922ce8fc4ca1ea2afec7f564ae74c0 as zfs RUN mkdir /out # copy zfs-related files from dom0-ztools using prepared list of files RUN while read -r x; do \ @@ -33,7 +33,7 @@ ARG BUILD_PKGS_BASE RUN BUILD_PKGS="${BUILD_PKGS_BASE}" eve-alpine-deploy.sh # hadolint ignore=DL3029 -FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:a11aaaaf4a01ba7f05c4ca1e527911f4846b3de8 AS cross-compilers +FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:384f40eb85fc07443bfbf74e254eef5c887c09d9 AS cross-compilers # will use several packages from target arch and copy them to sysroot # hadolint ignore=DL3006 @@ -137,9 +137,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build if [ "${TEST_TOOLS}" = "y" ] GOBIN=/final/opt/ GOFLAGS="" go install gotest.tools/gotestsum@v1.7.0; \ fi -FROM lfedge/eve-fscrypt:3ea961a94d9626c3ec905540f637186da6d00780 as fscrypt -FROM lfedge/eve-dnsmasq:0668838dd2e7758133a2011ec38963e343accb16 as dnsmasq -FROM lfedge/eve-gpt-tools:7b637a06d2a443044b05f35f1d1358babb5f4ef8 as gpttools +FROM lfedge/eve-fscrypt:2b3e65c5019da224b7cabe153c18c7520c620179 as fscrypt +FROM lfedge/eve-dnsmasq:d44f99cd023831ccf1ab9ed943279c007d712606 as dnsmasq +FROM lfedge/eve-gpt-tools:dd3e492b41e2eb41c293b6236e8c442054ecf0b0 as gpttools # collector collects everything together and then does any processing like stripping binaries. # We use this interim "collector" so that we can do processing. diff --git a/pkg/recovertpm/Dockerfile b/pkg/recovertpm/Dockerfile index bcdcbeb02d8..3fdf58f7937 100644 --- a/pkg/recovertpm/Dockerfile +++ b/pkg/recovertpm/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build # build the tpm-recovery tool WORKDIR / diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index a5113ef4db9..abaf4ae5cc6 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV BUILD_PKGS gcc musl-dev linux-headers RUN eve-alpine-deploy.sh diff --git a/pkg/sources/Dockerfile b/pkg/sources/Dockerfile index 4639deffea4..f02330831e6 100644 --- a/pkg/sources/Dockerfile +++ b/pkg/sources/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as tools +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as tools COPY collected_sources.tar.gz /var/collected_sources.tar.gz RUN mkdir -p /var/sources && tar -C /var/sources -xzf /var/collected_sources.tar.gz diff --git a/pkg/storage-init/Dockerfile b/pkg/storage-init/Dockerfile index eb3a8f91afa..138026968ad 100644 --- a/pkg/storage-init/Dockerfile +++ b/pkg/storage-init/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 as build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 as build ENV PKGS alpine-baselayout musl-utils bash glib squashfs-tools util-linux e2fsprogs e2fsprogs-extra keyutils dosfstools coreutils sgdisk smartmontools RUN eve-alpine-deploy.sh diff --git a/pkg/u-boot/Dockerfile b/pkg/u-boot/Dockerfile index e789b818909..867b98a5b9e 100644 --- a/pkg/u-boot/Dockerfile +++ b/pkg/u-boot/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build-base +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build-base ENV BUILD_PKGS bash binutils-dev build-base bc bison flex openssl-dev python3 swig dtc ENV BUILD_PKGS_amd64 python3-dev py-pip RUN eve-alpine-deploy.sh diff --git a/pkg/udev/Dockerfile b/pkg/udev/Dockerfile index b6595f10bc8..0327708d3f9 100644 --- a/pkg/udev/Dockerfile +++ b/pkg/udev/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2024 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV PKGS="udev kmod" RUN eve-alpine-deploy.sh diff --git a/pkg/uefi/Dockerfile b/pkg/uefi/Dockerfile index 5492f945a37..d8f1eaa9303 100644 --- a/pkg/uefi/Dockerfile +++ b/pkg/uefi/Dockerfile @@ -10,7 +10,7 @@ # git clone https://git.linaro.org/uefi/uefi-tools.git # ./uefi-tools/edk2-build.sh -b DEBUG -b RELEASE all # -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS make gcc g++ python3 libuuid nasm util-linux-dev bash git util-linux patch ENV BUILD_PKGS_amd64 iasl ENV BUILD_PKGS_arm64 iasl diff --git a/pkg/vtpm/Dockerfile b/pkg/vtpm/Dockerfile index 2457f4fc88e..281892d6841 100644 --- a/pkg/vtpm/Dockerfile +++ b/pkg/vtpm/Dockerfile @@ -3,8 +3,8 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-dom0-ztools:1d83564a1f068cffe472a8c8608c3eb39c6c97e2 AS dom0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-dom0-ztools:fbe729f942922ce8fc4ca1ea2afec7f564ae74c0 AS dom0 +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS="gcc g++ autoconf automake libtool make openssl-dev libtasn1-dev \ json-glib-dev gnutls bash expect gawk socat libseccomp-dev gmp-dev \ musl-utils autoconf-archive git json-c json-c-dev libcurl curl-dev \ diff --git a/pkg/watchdog/Dockerfile b/pkg/watchdog/Dockerfile index 080f0f653ba..c1596e87f95 100644 --- a/pkg/watchdog/Dockerfile +++ b/pkg/watchdog/Dockerfile @@ -1,7 +1,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS watchdog-build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS watchdog-build ENV BUILD_PKGS build-base file libtirpc-dev linux-headers tar util-linux ENV PKGS alpine-baselayout musl-utils libsmartcols RUN eve-alpine-deploy.sh diff --git a/pkg/wlan/Dockerfile b/pkg/wlan/Dockerfile index f24b778dd81..0ca8927bebf 100644 --- a/pkg/wlan/Dockerfile +++ b/pkg/wlan/Dockerfile @@ -1,6 +1,6 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV PKGS alpine-baselayout musl-utils wireless-tools wpa_supplicant RUN eve-alpine-deploy.sh diff --git a/pkg/wwan/Dockerfile b/pkg/wwan/Dockerfile index f7778dd5f44..6d97c90407b 100644 --- a/pkg/wwan/Dockerfile +++ b/pkg/wwan/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2023-2025 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS meson ninja git libc-dev glib-dev make gcc udev dbus-dev libgudev-dev ENV PKGS alpine-baselayout dbus glib kmod-dev libgudev RUN eve-alpine-deploy.sh diff --git a/pkg/xen-tools/Dockerfile b/pkg/xen-tools/Dockerfile index d8b88e1cbd6..8353e630172 100644 --- a/pkg/xen-tools/Dockerfile +++ b/pkg/xen-tools/Dockerfile @@ -3,8 +3,8 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-uefi:0813a2a0bc6eb92446346210070cf5e6b3cb9682 as uefi-build -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS runx-build +FROM lfedge/eve-uefi:cf30752ba2c056ff0466e26747e8e61d0b643107 as uefi-build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS runx-build ENV BUILD_PKGS mkinitfs gcc musl-dev e2fsprogs chrony agetty RUN eve-alpine-deploy.sh @@ -20,7 +20,7 @@ RUN gcc -s -o /chroot2 /tmp/chroot2.c -Wall -Werror RUN gcc -s -o /hacf /tmp/hacf.c -Wall -Werror RUN mkinitfs -n -F base -i /init-initrd -o /runx-initrd -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS build ENV BUILD_PKGS \ gcc make libc-dev dev86 xz-dev perl bash python3-dev \ gettext iasl util-linux-dev ncurses-dev glib-dev \ diff --git a/pkg/xen/Dockerfile b/pkg/xen/Dockerfile index 30f537e1bfc..8cb06c35a0d 100644 --- a/pkg/xen/Dockerfile +++ b/pkg/xen/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:308b37b2049096bc2385c28c1cbeef436985cc87 AS kernel-build +FROM lfedge/eve-alpine:80c5dbe1085d0650030be8a110eaec66ef532672 AS kernel-build ENV BUILD_PKGS argp-standalone automake bash bc binutils-dev bison build-base \ diffutils flex git gmp-dev gnupg installkernel kmod \