diff --git a/Makefile b/Makefile index e9e218238f..a6dffa7a0f 100644 --- a/Makefile +++ b/Makefile @@ -459,7 +459,7 @@ $(DOCKERFILE_FROM_CHECKER): $(DOCKERFILE_FROM_CHECKER_DIR)/*.go $(DOCKERFILE_FRO # this next section checks that the FROM hashes for any image in any dockerfile anywhere here are consistent. # For example, one Dockerfile has foo:abc and the next has foo:def, it will flag them. # These are the packages that we are ignoring for now -IGNORE_DOCKERFILE_HASHES_PKGS=bsp-imx vtpm optee-os wwan wlan watchdog uefi acrn acrn-kernel u-boot udev xen-tools xen alpine +IGNORE_DOCKERFILE_HASHES_PKGS=alpine IGNORE_DOCKERFILE_HASHES_EVE_TOOLS=bpftrace-compiler IGNORE_DOCKERFILE_HASHES_PKGS_ARGS=$(foreach pkg,$(IGNORE_DOCKERFILE_HASHES_PKGS),-i pkg/$(pkg)/Dockerfile) diff --git a/eve-tools/bpftrace-compiler/root/Dockerfile b/eve-tools/bpftrace-compiler/root/Dockerfile index 70f29c0a61..df843f21ed 100644 --- a/eve-tools/bpftrace-compiler/root/Dockerfile +++ b/eve-tools/bpftrace-compiler/root/Dockerfile @@ -7,7 +7,7 @@ FROM ${EVE_KERNEL} AS kernel FROM lfedge/eve-bpftrace:64f87b9dfce42524b0364159a6cc3b88ae3445b2 AS eve-bpftrace -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 AS bpftrace +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 656f703ecf..a1a0ee632d 100644 --- a/pkg/acrn-kernel/Dockerfile +++ b/pkg/acrn-kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as kernel-build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 1bb4c1ffa6..75a77016c5 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 AS kernel-build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 4729dd1205..c62b3c7142 100644 --- a/pkg/alpine/Dockerfile +++ b/pkg/alpine/Dockerfile @@ -40,7 +40,7 @@ RUN cp /mirror/${ALPINE_VERSION}/rootfs/etc/apk/repositories /etc/apk RUN cat /mirror/edge/rootfs/etc/apk/repositories >> /etc/apk/repositories RUN apk update -FROM lfedge/eve-alpine:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 AS compactor +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f AS compactor COPY --from=cache /etc/apk/repositories* /etc/apk/ COPY --from=cache /etc/apk/keys /etc/apk/keys/ diff --git a/pkg/bsp-imx/Dockerfile b/pkg/bsp-imx/Dockerfile index 6baf13592d..95bdec1876 100644 --- a/pkg/bsp-imx/Dockerfile +++ b/pkg/bsp-imx/Dockerfile @@ -4,7 +4,7 @@ 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 +ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f # OPTEE-OS images FROM lfedge/eve-optee-os:150dfb58cd0fc2b781aa8e700d479e369c8cc5e9 AS optee-os diff --git a/pkg/optee-os/Dockerfile b/pkg/optee-os/Dockerfile index 15579154f2..c9be350bc3 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 +ARG EVE_ALPINE_IMAGE=lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f # hadolint ignore=DL3006 FROM ${EVE_ALPINE_IMAGE} as build-native diff --git a/pkg/pillar/Dockerfile b/pkg/pillar/Dockerfile index b19cd9c6b2..318bf85120 100644 --- a/pkg/pillar/Dockerfile +++ b/pkg/pillar/Dockerfile @@ -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:2a1d062fce410865e7024a83de327a68e52db26c AS cross-compilers +FROM --platform=${BUILDPLATFORM} lfedge/eve-cross-compilers:250abc77c8c39664905b66a2673102ec5cd3b056 AS cross-compilers # will use several packages from target arch and copy them to sysroot # hadolint ignore=DL3006 diff --git a/pkg/u-boot/Dockerfile b/pkg/u-boot/Dockerfile index d8a2bf38da..45ad194aef 100644 --- a/pkg/u-boot/Dockerfile +++ b/pkg/u-boot/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as build-base +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 b3c304706a..57b6c30f16 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f AS build ENV PKGS udev RUN eve-alpine-deploy.sh diff --git a/pkg/uefi/Dockerfile b/pkg/uefi/Dockerfile index 510965c5f1..402883c04e 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 b001517e02..13c1bd9134 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:b8eaeec19d373228a4a842374e5de0d50f050853 as dom0 -FROM lfedge/eve-alpine:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as build +FROM lfedge/eve-dom0-ztools:09f378d92d6c8ada04fb8e9cf5d45fc8fdf934f9 AS dom0 +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 289f7defab..21da9e276c 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 AS watchdog-build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 82a4f20a17..18c5aef8a5 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:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 409b5c80a0..d96a42e859 100644 --- a/pkg/wwan/Dockerfile +++ b/pkg/wwan/Dockerfile @@ -3,7 +3,7 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-alpine:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 as build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f AS build ENV BUILD_PKGS meson ninja git libc-dev glib-dev make gcc udev dbus-dev libgudev-dev go 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 b3dad4fc07..2b14a3617e 100644 --- a/pkg/xen-tools/Dockerfile +++ b/pkg/xen-tools/Dockerfile @@ -3,9 +3,9 @@ # Copyright (c) 2023 Zededa, Inc. # SPDX-License-Identifier: Apache-2.0 -FROM lfedge/eve-uefi:d821658883d6748d8bbf0d6640c62288e3ce8c6f as uefi-build +FROM lfedge/eve-uefi:d821658883d6748d8bbf0d6640c62288e3ce8c6f AS uefi-build -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 as runx-build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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:1f7685f95a475c6bbe682f0b976f12180b6c8726 as build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f 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 280eaa8d0d..ec8fcf8ea9 100644 --- a/pkg/xen/Dockerfile +++ b/pkg/xen/Dockerfile @@ -1,4 +1,4 @@ -FROM lfedge/eve-alpine:1f7685f95a475c6bbe682f0b976f12180b6c8726 as kernel-build +FROM lfedge/eve-alpine:591df01e581889c3027514c8a91feaca1c8ad49f AS kernel-build ENV BUILD_PKGS argp-standalone automake bash bc binutils-dev bison build-base \ diffutils flex git gmp-dev gnupg installkernel kmod \