Skip to content

Commit

Permalink
Dockerfiles: bump several images
Browse files Browse the repository at this point in the history
bsp-imx, vtpm and optee-os for cross-compilers and ztools in order to
use the same image tag everywhere

Signed-off-by: Christoph Ostarek <[email protected]>
  • Loading branch information
christoph-zededa committed Oct 11, 2024
1 parent c8e8151 commit 8595e96
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -461,9 +461,6 @@ check-docker-hashes-consistency: $(DOCKERFILE_FROM_CHECKER)
@echo "Checking Dockerfiles for inconsistencies"
$(DOCKERFILE_FROM_CHECKER) ./ \
-i ./eve-tools/bpftrace-compiler/Dockerfile \
-i pkg/bsp-imx/Dockerfile \
-i pkg/vtpm/Dockerfile \
-i pkg/optee-os/Dockerfile \
-i pkg/installer/Dockerfile

yetus:
Expand Down
2 changes: 1 addition & 1 deletion pkg/pillar/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/vtpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2023 Zededa, Inc.
# SPDX-License-Identifier: Apache-2.0

FROM lfedge/eve-dom0-ztools:b8eaeec19d373228a4a842374e5de0d50f050853 as dom0
FROM lfedge/eve-dom0-ztools:09f378d92d6c8ada04fb8e9cf5d45fc8fdf934f9 AS dom0
FROM lfedge/eve-alpine:82df60e43ab9f8c935584b8c7b4d0a4b0271d608 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 \
Expand Down

0 comments on commit 8595e96

Please sign in to comment.