Skip to content

Commit

Permalink
Revert "Dockerfile.gcc: re-enable docker cache"
Browse files Browse the repository at this point in the history
enabling docker cache does not work and the sbom is now created
totally different

This reverts commit cc3e98a.

Signed-off-by: Christoph Ostarek <[email protected]>
  • Loading branch information
christoph-zededa committed Oct 21, 2024
1 parent cc3e98a commit 2903e4e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 2 additions & 7 deletions Dockerfile.gcc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#syntax=docker/dockerfile:1.9.0-labs
#syntax=docker/dockerfile:1.6
ARG ALPINE_VERSION=3.16
ARG KERNEL_CONFIG=eve_defconfig
ARG KERNEL_BIN=arch/x86/boot/bzImage
Expand Down Expand Up @@ -81,9 +81,7 @@ ARG LOCALVERSION
# ARCH and CROSS_COMPILE are inherited from builder-${TARGETARCH}-${BUILDARCH}
# ARCH is always set to the target arch
# CROSS_COMPILE is set to empty string for native builds
RUN mkdir /kernel-src
COPY --exclude=kernel-sbom-*.json . /kernel-src

COPY . /kernel-src
WORKDIR /kernel-src

RUN sed -i Makefile -e 's/--build-id=sha1/--build-id=none/g'
Expand Down Expand Up @@ -177,7 +175,4 @@ FROM scratch
ENTRYPOINT []
CMD []
WORKDIR /
# copy SBOM files
COPY kernel-sbom-docker.spdx.json /
COPY kernel-sbom-gh.spdx.json /
COPY --from=artifacts /out/* /
2 changes: 1 addition & 1 deletion Makefile.eve
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ LINUXKIT_VERSION=58c36c9eb0c32acf66ae7877d18a9ad24d59d73e
GOBIN=/tmp/linuxkit-$(LINUXKIT_VERSION)
LK=$(GOBIN)/linuxkit

BUILD_KIT_VERSION=v0.15.2
BUILD_KIT_VERSION=v0.12.5
BUILD_KIT_BUILDER=eve-kernel-builder-$(BUILD_KIT_VERSION)

SOURCE_DATE_EPOCH=$(shell git log -1 --format=%ct)
Expand Down

0 comments on commit 2903e4e

Please sign in to comment.