Skip to content

Commit

Permalink
Do not force pkg build by default
Browse files Browse the repository at this point in the history
Let's make FORCE_BUILD flag optional and rely on hash provided by
linuxkit on changes (linuxkit/linuxkit#3875).
With no flag provided linuxkit will check that
image published, if not, will build it.
This way we can avoid building of dependencies as well.

Signed-off-by: Petr Fedchenkov <giggsoff@gmail.com>
  • Loading branch information
giggsoff authored and eriknordmark committed Nov 29, 2022
1 parent aa23518 commit 6c85ce0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ LINUXKIT_OPTS=$(if $(strip $(EVE_HASH)),--hash) $(EVE_HASH) $(if $(strip $(EVE_R
LINUXKIT_PKG_TARGET=build
LINUXKIT_PATCHES_DIR=tools/linuxkit/patches
RESCAN_DEPS=FORCE
FORCE_BUILD=--force
# set FORCE_BUILD to --force to enforce rebuild
FORCE_BUILD=

# we use the following block to assign correct tag to the Docker registry artifact
ifeq ($(LINUXKIT_PKG_TARGET),push)
Expand Down Expand Up @@ -584,7 +585,6 @@ $(LIVE).parallels: $(LIVE).raw

# top-level linuxkit packages targets, note the one enforcing ordering between packages
pkgs: RESCAN_DEPS=
pkgs: FORCE_BUILD=
pkgs: build-tools $(PKGS)
@echo Done building packages

Expand Down

0 comments on commit 6c85ce0

Please sign in to comment.