Skip to content

Commit 1fe54a0

Browse files
jaxesnjaxesn
authored
Adds run-in-docker helps and better checksum + attribution generation (#1568)
* Adds run-in-docker helps and better checksum + attribution generation * Regenerated help.mk files * Updates readmes for new make target
1 parent 2f52daa commit 1fe54a0

File tree

39 files changed

+370
-159
lines changed

39 files changed

+370
-159
lines changed

‎Common.mk

+65-29
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ SKIPPED_K8S_VERSIONS?=
8888
BINARIES_ARE_RELEASE_BRANCHED?=true
8989
IS_RELEASE_BRANCH_BUILD=$(filter true,$(HAS_RELEASE_BRANCHES))
9090
IS_UNRELEASE_BRANCH_TARGET=$(and $(filter false,$(BINARIES_ARE_RELEASE_BRANCHED)),$(filter binaries attribution checksums,$(MAKECMDGOALS)))
91-
TARGETS_ALLOWED_WITH_NO_RELEASE_BRANCH?=build release clean help
91+
TARGETS_ALLOWED_WITH_NO_RELEASE_BRANCH?=build release clean clean-go-cache help
9292
MAKECMDGOALS_WITHOUT_VAR_VALUE=$(foreach t,$(MAKECMDGOALS),$(if $(findstring var-value-,$(t)),,$(t)))
9393
ifneq ($(and $(IS_RELEASE_BRANCH_BUILD),$(or $(RELEASE_BRANCH),$(IS_UNRELEASE_BRANCH_TARGET))),)
9494
RELEASE_BRANCH_SUFFIX=$(if $(filter true,$(BINARIES_ARE_RELEASE_BRANCHED)),/$(RELEASE_BRANCH),)
@@ -372,7 +372,7 @@ IS_ON_BUILDER_BASE?=$(shell if [ -f /buildkit.sh ]; then echo true; fi;)
372372
BUILDER_PLATFORM?=$(shell echo $$(go env GOHOSTOS)/$$(go env GOHOSTARCH))
373373
needs-cgo-builder=$(and $(if $(filter true,$(CGO_CREATE_BINARIES)),true,),$(if $(filter-out $(1),$(BUILDER_PLATFORM)),true,))
374374
USE_DOCKER_FOR_CGO_BUILD?=false
375-
DOCKER_USE_ID_FOR_LINUX=$(shell if [ "$$(uname -s)" = "Linux" ]; then echo "-u $$(id -u $${USER}):$$(id -g $${USER})"; fi)
375+
DOCKER_USE_ID_FOR_LINUX=$(shell if [ "$$(uname -s)" = "Linux" ] && [ -n "$${USER:-}" ]; then echo "-u $$(id -u $${USER}):$$(id -g $${USER})"; fi)
376376
GO_MOD_CACHE=$(shell source $(BUILD_LIB)/common.sh && build::common::use_go_version $(GOLANG_VERSION) > /dev/null 2>&1 && go env GOMODCACHE)
377377
GO_BUILD_CACHE=$(shell source $(BUILD_LIB)/common.sh && build::common::use_go_version $(GOLANG_VERSION) > /dev/null 2>&1 && go env GOCACHE)
378378
CGO_TARGET?=
@@ -425,6 +425,7 @@ KUSTOMIZE_TARGET=$(OUTPUT_DIR)/kustomize
425425
GIT_DEPS_DIR?=$(OUTPUT_DIR)/gitdependencies
426426
SPECIAL_TARGET_SECONDARY=$(strip $(PROJECT_DEPENDENCIES_TARGETS) $(GO_MOD_DOWNLOAD_TARGETS))
427427
SKIP_CHECKSUM_VALIDATION?=false
428+
IN_DOCKER_TARGETS=all-attributions all-attributions-checksums all-checksums attribution attribution-checksums binaries checksums clean clean-go-cache
428429
####################################################
429430

430431
#################### TARGETS FOR OVERRIDING ########
@@ -433,15 +434,6 @@ RELEASE_TARGETS?=validate-checksums $(if $(IMAGE_NAMES),images,) $(if $(filter t
433434
####################################################
434435

435436
define BUILDCTL
436-
if [[ "$(USE_DOCKER_FOR_CGO_BUILD)" = "true" ]]; then \
437-
source $(BUILD_LIB)/common.sh && build::docker::retry_pull $(BUILDER_IMAGE); \
438-
docker run --rm -w /eks-anywhere-build-tooling/projects/$(COMPONENT) $(DOCKER_USE_ID_FOR_LINUX) \
439-
--mount type=bind,source=$(BASE_DIRECTORY),target=/eks-anywhere-build-tooling \
440-
--mount type=bind,source=$(GO_MOD_CACHE),target=/mod-cache \
441-
-e GOPROXY=$(GOPROXY) -e GOMODCACHE=/mod-cache \
442-
--platform $(IMAGE_PLATFORMS) \
443-
--init --entrypoint make $(BUILDER_IMAGE) $(CGO_TARGET) BINARY_PLATFORMS=$(IMAGE_PLATFORMS); \
444-
else \
445437
$(BUILD_LIB)/buildkit.sh \
446438
build \
447439
--frontend dockerfile.v0 \
@@ -456,9 +448,30 @@ define BUILDCTL
456448
$(foreach IMPORT_CACHE,$(IMAGE_IMPORT_CACHE),--import-cache $(IMPORT_CACHE)) \
457449
$(if $(IMAGE_METADATA_FILE),--metadata-file $(IMAGE_METADATA_FILE),) \
458450
--opt target=$(IMAGE_TARGET) \
459-
--output type=$(IMAGE_OUTPUT_TYPE),oci-mediatypes=true,\"name=$(ALL_IMAGE_TAGS)\",$(IMAGE_OUTPUT); \
460-
fi
461-
endef
451+
--output type=$(IMAGE_OUTPUT_TYPE),oci-mediatypes=true,\"name=$(ALL_IMAGE_TAGS)\",$(IMAGE_OUTPUT)
452+
endef
453+
454+
define CGO_DOCKER
455+
source $(BUILD_LIB)/common.sh && build::docker::retry_pull --platform $(IMAGE_PLATFORMS) $(BUILDER_IMAGE); \
456+
INTERACTIVE="$(shell if [ -t 0 ]; then echo '-it'; fi)"; \
457+
docker run --rm $$INTERACTIVE -w /eks-distro/projects/$(COMPONENT) $(DOCKER_USE_ID_FOR_LINUX) \
458+
--mount type=bind,source=$(BASE_DIRECTORY),target=/eks-distro \
459+
--mount type=bind,source=$(GO_MOD_CACHE),target=/mod-cache \
460+
-e GOPROXY=$(GOPROXY) -e GOMODCACHE=/mod-cache \
461+
--platform $(IMAGE_PLATFORMS) \
462+
--init $(BUILDER_IMAGE) make $(CGO_TARGET) BINARY_PLATFORMS=$(IMAGE_PLATFORMS)
463+
endef
464+
465+
define SIMPLE_CREATE_BINARIES_SHELL
466+
$(BASE_DIRECTORY)/build/lib/simple_create_binaries.sh $(MAKE_ROOT) $(MAKE_ROOT)/$(OUTPUT_PATH) $(REPO) $(GOLANG_VERSION) $(PLATFORM) "$(SOURCE_PATTERN)" \
467+
"$(GOBUILD_COMMAND)" "$(EXTRA_GOBUILD_FLAGS)" "$(GO_LDFLAGS)" $(CGO_ENABLED) "$(CGO_LDFLAGS)" "$(GO_MOD_PATH)" "$(BINARY_TARGET_FILES_BUILD_TOGETHER)"
468+
endef
469+
470+
# $1 - make target
471+
# $2 - target directory
472+
define CGO_CREATE_BINARIES_SHELL
473+
$(MAKE) binary-builder/cgo/$(PLATFORM:linux/%=%) IMAGE_OUTPUT=dest=$(OUTPUT_BIN_DIR)/$(2) CGO_TARGET=$(1) IMAGE_BUILD_ARGS="GOPROXY COMPONENT CGO_TARGET"
474+
endef
462475

463476
define WRITE_LOCAL_IMAGE_TAG
464477
echo $(IMAGE_TAG) > $(IMAGE_OUTPUT_DIR)/$(IMAGE_OUTPUT_NAME).docker_tag
@@ -528,12 +541,7 @@ $(OUTPUT_BIN_DIR)/%: SOURCE_PATTERN=$(if $(filter $(BINARY_TARGET),$(BINARY_TARG
528541
$(OUTPUT_BIN_DIR)/%: OUTPUT_PATH=$(if $(and $(if $(filter false,$(call IS_ONE_WORD,$(BINARY_TARGET_FILES_BUILD_TOGETHER))),$(filter $(BINARY_TARGET),$(BINARY_TARGET_FILES_BUILD_TOGETHER)))),$(@D)/,$@)
529542
$(OUTPUT_BIN_DIR)/%: GO_MOD_PATH=$($(call GO_MOD_TARGET_FOR_BINARY_VAR_NAME,$(BINARY_TARGET)))
530543
$(OUTPUT_BIN_DIR)/%: $$(call GO_MOD_DOWNLOAD_TARGET_FROM_GO_MOD_PATH,$$(GO_MOD_PATH))
531-
if [ "$(call needs-cgo-builder,$(PLATFORM))" == "true" ]; then \
532-
$(MAKE) binary-builder/cgo/$(PLATFORM:linux/%=%) IMAGE_OUTPUT=dest=$(OUTPUT_BIN_DIR)/$(*D) CGO_TARGET=$@ IMAGE_BUILD_ARGS="GOPROXY COMPONENT CGO_TARGET"; \
533-
else \
534-
$(BASE_DIRECTORY)/build/lib/simple_create_binaries.sh $(MAKE_ROOT) $(MAKE_ROOT)/$(OUTPUT_PATH) $(REPO) $(GOLANG_VERSION) $(PLATFORM) "$(SOURCE_PATTERN)" \
535-
"$(GOBUILD_COMMAND)" "$(EXTRA_GOBUILD_FLAGS)" "$(GO_LDFLAGS)" $(CGO_ENABLED) "$(CGO_LDFLAGS)" "$(GO_MOD_PATH)" "$(BINARY_TARGET_FILES_BUILD_TOGETHER)"; \
536-
fi
544+
$(if $(filter true,$(call needs-cgo-builder,$(PLATFORM))),$(call CGO_CREATE_BINARIES_SHELL,$@,$(*D)),$(call SIMPLE_CREATE_BINARIES_SHELL))
537545
endif
538546

539547
.PHONY: binaries
@@ -591,6 +599,11 @@ attribution: $(and $(filter true,$(HAS_LICENSES)),$(ATTRIBUTION_TARGETS))
591599
attribution-pr: attribution
592600
$(BASE_DIRECTORY)/build/update-attribution-files/create_pr.sh
593601

602+
.PHONY: all-attributions
603+
all-attributions:
604+
$(BASE_DIRECTORY)/build/update-attribution-files/make_attribution.sh projects/$(COMPONENT) attribution
605+
606+
594607
#### Tarball Targets
595608

596609
.PHONY: tarballs
@@ -629,6 +642,18 @@ ifneq ($(and $(strip $(BINARY_TARGETS)), $(filter false, $(SKIP_CHECKSUM_VALIDAT
629642
$(BASE_DIRECTORY)/build/lib/validate_checksums.sh $(MAKE_ROOT) $(PROJECT_ROOT) $(MAKE_ROOT)/$(OUTPUT_BIN_DIR) $(FAKE_ARM_BINARIES_FOR_VALIDATION)
630643
endif
631644

645+
.PHONY: attribution-checksums
646+
attribution-checksums: attribution checksums
647+
648+
.PHONY: all-checksums
649+
all-checksums:
650+
$(BASE_DIRECTORY)/build/update-attribution-files/make_attribution.sh projects/$(COMPONENT) checksums
651+
652+
.PHONY: all-attributions-checksums
653+
all-attributions-checksums:
654+
$(BASE_DIRECTORY)/build/update-attribution-files/make_attribution.sh projects/$(COMPONENT) "attribution checksums"
655+
656+
632657
#### Image Helpers
633658

634659
ifneq ($(IMAGE_NAMES),)
@@ -691,14 +716,14 @@ endif
691716
## CGO Targets
692717
.PHONY: %/cgo/amd64 %/cgo/arm64 prepare-cgo-folder
693718

719+
# .git folder needed so git properly finds the root of the repo
694720
prepare-cgo-folder:
695721
@mkdir -p $(CGO_SOURCE)/eks-distro/
696722
rsync -rm --exclude='.git/***' \
697723
--exclude='***/_output/***' --exclude='projects/$(COMPONENT)/$(REPO)/***' \
698724
--include='projects/$(COMPONENT)/***' --include='*/' --exclude='projects/***' \
699725
$(BASE_DIRECTORY)/ $(CGO_SOURCE)/eks-distro/
700726
@mkdir -p $(OUTPUT_BIN_DIR)/$(subst /,-,$(IMAGE_PLATFORMS))
701-
# Need so git properly finds the root of the repo
702727
@mkdir -p $(CGO_SOURCE)/eks-distro/.git/{refs,objects}
703728
@cp $(BASE_DIRECTORY)/.git/HEAD $(CGO_SOURCE)/eks-distro/.git
704729

@@ -707,16 +732,16 @@ prepare-cgo-folder:
707732
%/cgo/amd64 %/cgo/arm64: IMAGE_NAME=binary-builder
708733
%/cgo/amd64 %/cgo/arm64: IMAGE_BUILD_ARGS?=GOPROXY COMPONENT
709734
%/cgo/amd64 %/cgo/arm64: IMAGE_CONTEXT_DIR?=$(CGO_SOURCE)
710-
%/cgo/amd64 %/cgo/arm64: BUILDER_IMAGE=$(CURRENT_BUILDER_BASE_IMAGE)
735+
%/cgo/amd64 %/cgo/arm64: BUILDER_IMAGE=$(GOLANG_GCC_BUILDER_IMAGE)
711736

712737
%/cgo/amd64: IMAGE_PLATFORMS=linux/amd64
713738
%/cgo/arm64: IMAGE_PLATFORMS=linux/arm64
714739

715740
%/cgo/amd64: prepare-cgo-folder
716-
$(BUILDCTL)
741+
$(if $(filter true, $(USE_DOCKER_FOR_CGO_BUILD)),$(CGO_DOCKER),$(BUILDCTL))
717742

718743
%/cgo/arm64: prepare-cgo-folder
719-
$(BUILDCTL)
744+
$(if $(filter true, $(USE_DOCKER_FOR_CGO_BUILD)),$(CGO_DOCKER),$(BUILDCTL))
720745

721746
# As an attempt to see if using docker is more stable for cgo builds in Codebuild
722747
binary-builder/cgo/%: USE_DOCKER_FOR_CGO_BUILD=$(shell command -v docker &> /dev/null && docker info > /dev/null 2>&1 && echo "true")
@@ -824,7 +849,7 @@ add-generated-help-block:
824849
$(BUILD_LIB)/generate_help_body.sh $(MAKE_ROOT) "$(BINARY_TARGET_FILES)" "$(BINARY_PLATFORMS)" "${BINARY_TARGETS}" \
825850
$(REPO) $(if $(PATCHES_DIR),true,false) "$(LOCAL_IMAGE_TARGETS)" "$(IMAGE_TARGETS)" "$(BUILD_TARGETS)" "$(RELEASE_TARGETS)" \
826851
"$(HAS_S3_ARTIFACTS)" "$(HAS_LICENSES)" "$(REPO_NO_CLONE)" "$(PROJECT_DEPENDENCIES_TARGETS)" \
827-
"$(HAS_HELM_CHART)"
852+
"$(HAS_HELM_CHART)" "$(IN_DOCKER_TARGETS)"
828853

829854
## --------------------------------------
830855
## Update Helpers
@@ -835,10 +860,6 @@ add-generated-help-block:
835860
run-target-in-docker: # Run `MAKE_TARGET` using builder base docker container
836861
$(BUILD_LIB)/run_target_docker.sh $(COMPONENT) $(MAKE_TARGET) $(IMAGE_REPO) "$(RELEASE_BRANCH)" $(ARTIFACTS_BUCKET)
837862

838-
.PHONY: update-attribution-checksums-docker
839-
update-attribution-checksums-docker: # Update attribution and checksums using the builder base docker container
840-
$(BUILD_LIB)/update_checksum_docker.sh $(COMPONENT) $(IMAGE_REPO) $(RELEASE_BRANCH)
841-
842863
.PHONY: stop-docker-builder
843864
stop-docker-builder: # Clean up builder base docker container
844865
docker rm -f -v eks-d-builder
@@ -856,6 +877,10 @@ update-go-mods: checkout-repo
856877
cp $(REPO)/$$gomod/go.{mod,sum} $(DEST_PATH); \
857878
done
858879

880+
.PHONY: all-update-go-mods
881+
all-update-go-mods:
882+
$(BASE_DIRECTORY)/build/update-attribution-files/make_attribution.sh projects/$(COMPONENT) update-go-mods
883+
859884
.PHONY: update-vendor-for-dep-patch
860885
update-vendor-for-dep-patch: # After bumping dep in go.mod file, uses generic vendor update script or one provided from upstream project
861886
update-vendor-for-dep-patch: checkout-repo
@@ -889,3 +914,14 @@ create-ecr-repos: $(foreach image,$(IMAGE_NAMES),$(image)/create-ecr-repo) $(if
889914
var-value-%:
890915
@echo $($*)
891916

917+
## --------------------------------------
918+
## Docker Helpers
919+
## --------------------------------------
920+
# $1 - target
921+
define RUN_IN_DOCKER_TARGET
922+
.PHONY: run-$(1)-in-docker
923+
run-$(1)-in-docker: MAKE_TARGET=$(1)
924+
run-$(1)-in-docker: run-target-in-docker
925+
endef
926+
927+
$(foreach target,$(IN_DOCKER_TARGETS),$(eval $(call RUN_IN_DOCKER_TARGET,$(target))))

‎Makefile

+3-7
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ makes-binaries-%:
134134
run-target-in-docker:
135135
build/lib/run_target_docker.sh $(PROJECT) $(MAKE_TARGET) $(IMAGE_REPO) $(RELEASE_BRANCH)
136136

137-
.PHONY: update-attribution-checksums-docker
138-
update-attribution-checksums-docker:
139-
build/lib/update_checksum_docker.sh $(PROJECT) $(IMAGE_REPO) $(RELEASE_BRANCH)
140-
141137
.PHONY: stop-docker-builder
142138
stop-docker-builder:
143139
docker rm -f -v eks-d-builder
@@ -168,7 +164,7 @@ attribution-files: $(addprefix attribution-files-project-, $(ALL_PROJECTS))
168164
.PHONY: attribution-files-project-%
169165
attribution-files-project-%:
170166
$(eval PROJECT_PATH=projects/$(subst _,/,$*))
171-
build/update-attribution-files/make_attribution.sh $(PROJECT_PATH) "attribution clean-output clean-go-cache"
167+
$(MAKE) -C $(PROJECT_PATH) all-attributions
172168

173169
.PHONY: update-attribution-files
174170
update-attribution-files: add-generated-help-block go-mod-files attribution-files
@@ -178,7 +174,7 @@ update-attribution-files: add-generated-help-block go-mod-files attribution-file
178174
.PHONY: checksum-files-project-%
179175
checksum-files-project-%:
180176
$(eval PROJECT_PATH=projects/$(subst _,/,$*))
181-
build/update-attribution-files/make_attribution.sh $(PROJECT_PATH) "checksums clean-output clean-go-cache"
177+
$(MAKE) -C $(PROJECT_PATH) all-checksums
182178

183179
.PHONY: update-checksum-files
184180
update-checksum-files: $(addprefix checksum-files-project-, $(ALL_PROJECTS))
@@ -187,7 +183,7 @@ update-checksum-files: $(addprefix checksum-files-project-, $(ALL_PROJECTS))
187183
.PHONY: go-mod-files-project-%
188184
go-mod-files-project-%:
189185
$(eval PROJECT_PATH=projects/$(subst _,/,$*))
190-
build/update-attribution-files/make_attribution.sh $(PROJECT_PATH) update-go-mods
186+
$(MAKE) -C $(PROJECT_PATH) all-update-go-mods
191187

192188
.PHONY: go-mod-files
193189
go-mod-files: $(addprefix go-mod-files-project-, $(ALL_PROJECTS))

‎build/lib/generate_help_body.sh

+12-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ HAS_LICENSES="${12}"
3232
REPO_NO_CLONE="${13}"
3333
FETCH_BINARIES_TARGETS="${14}"
3434
HAS_HELM_CHART="${15}"
35+
IN_DOCKER_TARGETS="${16}"
3536

3637
NL=$'\n'
3738
HEADER="########### DO NOT EDIT #############################"
@@ -70,6 +71,7 @@ if [ ! -z "$(echo "$BINARY_TARGETS" | xargs)" ]; then
7071
CHECKSUMS_TARGETS_HELP+="${NL}${NL}##@ Checksum Targets"
7172
CHECKSUMS_TARGETS_HELP+="${NL}checksums: ## Update checksums file based on currently built binaries."
7273
CHECKSUMS_TARGETS_HELP+="${NL}validate-checksums: # Validate checksums of currently built binaries against checksums file."
74+
CHECKSUMS_TARGETS_HELP+="${NL}all-checksums: ## Update checksums files for all RELEASE_BRANCHes."
7375
fi
7476

7577
GIT_TARGETS_HELP=""
@@ -121,6 +123,9 @@ if [[ "$HAS_LICENSES" == "true" ]]; then
121123
LICENSES_TARGETS+="${NL}gather-licenses: ## Helper to call \$(GATHER_LICENSES_TARGETS) which gathers all licenses"
122124
LICENSES_TARGETS+="${NL}attribution: ## Generates attribution from licenses gathered during \`gather-licenses\`."
123125
LICENSES_TARGETS+="${NL}attribution-pr: ## Generates PR to update attribution files for projects"
126+
LICENSES_TARGETS+="${NL}attribution-checksums: ## Update attribution and checksums files."
127+
LICENSES_TARGETS+="${NL}all-attributions: ## Update attribution files for all RELEASE_BRANCHes."
128+
LICENSES_TARGETS+="${NL}all-attributions-checksums: ## Update attribution and checksums files for all RELEASE_BRANCHes."
124129
fi
125130

126131
CLEAN_TARGETS="${NL}${NL}##@ Clean Targets"
@@ -145,11 +150,17 @@ if [[ "$HAS_HELM_CHART" == "true" ]]; then
145150
HELM_TARGETS+="${NL}helm/push: ## Build helm chart and push to registry defined in IMAGE_REPO."
146151
fi
147152

153+
TARGETS=(${IN_DOCKER_TARGETS// / })
154+
DOCKER_TARGETS="${NL}${NL}##@ Run in Docker Targets"
155+
for target in "${TARGETS[@]}"; do
156+
DOCKER_TARGETS+="${NL}run-${target}-in-docker: ## Run \`${target}\` in docker builder container"
157+
done
158+
148159
cat >> $HELPFILE << EOF
149160
${NL}${NL}${NL}${HEADER}
150161
# To update call: make add-generated-help-block
151162
# This is added to help document dynamic targets and support shell autocompletion
152-
${GIT_TARGETS_HELP}${PATCHES_TARGET}${BINARY_TARGETS_HELP}${IMAGE_TARGETS_HELP}${HELM_TARGETS}${FETCH_BINARY_TARGETS_HELP}${CHECKSUMS_TARGETS_HELP}${ARTIFACTS_TARGETS}${LICENSES_TARGETS}${CLEAN_TARGETS}
163+
${GIT_TARGETS_HELP}${PATCHES_TARGET}${BINARY_TARGETS_HELP}${IMAGE_TARGETS_HELP}${HELM_TARGETS}${FETCH_BINARY_TARGETS_HELP}${CHECKSUMS_TARGETS_HELP}${DOCKER_TARGETS}${ARTIFACTS_TARGETS}${LICENSES_TARGETS}${CLEAN_TARGETS}
153164
${EXTRA_HELP}
154165
155166
##@ Build Targets

‎build/lib/run_target_docker.sh

+10-36
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PROJECT="$1"
2121
TARGET="$2"
2222
IMAGE_REPO="${3:-}"
2323
RELEASE_BRANCH="${4:-}"
24-
ARTIFACTS_BUCKET="${5:-}"
24+
ARTIFACTS_BUCKET="${5:-$ARTIFACTS_BUCKET}"
2525

2626
SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
2727
MAKE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
@@ -37,41 +37,15 @@ echo "****************************************************************"
3737
if ! docker ps -f name=eks-d-builder | grep -w eks-d-builder; then
3838
build::docker::retry_pull public.ecr.aws/eks-distro-build-tooling/builder-base:latest
3939

40-
NETRC=""
41-
if [ -f $HOME/.netrc ]; then
42-
NETRC="--mount type=bind,source=$HOME/.netrc,target=/root/.netrc"
43-
fi
40+
NETRC=""
41+
if [ -f $HOME/.netrc ]; then
42+
NETRC="--mount type=bind,source=$HOME/.netrc,target=/root/.netrc"
43+
fi
4444

45-
docker run -d --name eks-d-builder --privileged $NETRC -e GOPROXY=$GOPROXY --entrypoint sleep \
46-
public.ecr.aws/eks-distro-build-tooling/builder-base:latest infinity
45+
docker run -d --name eks-d-builder --privileged $NETRC \
46+
--mount type=bind,source=$MAKE_ROOT,target=/eks-distro \
47+
-e GOPROXY=${GOPROXY:-} --entrypoint sleep \
48+
public.ecr.aws/eks-distro-build-tooling/builder-base:latest infinity
4749
fi
4850

49-
EXTRA_INCLUDES=""
50-
PROJECT_DEPENDENCIES=$(make --no-print-directory -C $MAKE_ROOT/projects/$PROJECT var-value-PROJECT_DEPENDENCIES RELEASE_BRANCH=$RELEASE_BRANCH)
51-
if [ -n "$PROJECT_DEPENDENCIES" ]; then
52-
DEPS=(${PROJECT_DEPENDENCIES// / })
53-
for dep in "${DEPS[@]}"; do
54-
DEP_PRODUCT="$(cut -d/ -f1 <<< $dep)"
55-
DEP_ORG="$(cut -d/ -f2 <<< $dep)"
56-
DEP_REPO="$(cut -d/ -f3 <<< $dep)"
57-
58-
if [[ "$DEP_PRODUCT" == "eksd" ]]; then
59-
continue
60-
fi
61-
62-
EXTRA_INCLUDES+=" --include=projects/$DEP_ORG/$DEP_REPO/***"
63-
done
64-
fi
65-
66-
rsync -e 'docker exec -i' -t -rm --exclude='.git/***' \
67-
--exclude="projects/$PROJECT/_output/***" --exclude="projects/$PROJECT/$(basename $PROJECT)/***" \
68-
--include="projects/$PROJECT/***" $EXTRA_INCLUDES \
69-
--include='*/' --exclude='projects/***' $MAKE_ROOT/ eks-d-builder:/eks-distro
70-
71-
# Need so git properly finds the root of the repo
72-
CURRENT_HEAD="$(cat $MAKE_ROOT/.git/HEAD | awk '{print $2}')"
73-
docker exec -it eks-d-builder mkdir -p /eks-distro/.git/{refs,objects} /eks-distro/.git/$(dirname $CURRENT_HEAD)
74-
docker cp $MAKE_ROOT/.git/HEAD eks-d-builder:/eks-distro/.git
75-
docker cp $MAKE_ROOT/.git/$CURRENT_HEAD eks-d-builder:/eks-distro/.git/$CURRENT_HEAD
76-
77-
docker exec -it eks-d-builder make $TARGET -C /eks-distro/projects/$PROJECT RELEASE_BRANCH=$RELEASE_BRANCH IMAGE_REPO=$IMAGE_REPO ARTIFACTS_BUCKET=$ARTIFACTS_BUCKET
51+
docker exec -e RELEASE_BRANCH=$RELEASE_BRANCH -it eks-d-builder make $TARGET -C /eks-distro/projects/$PROJECT IMAGE_REPO=$IMAGE_REPO ARTIFACTS_BUCKET=$ARTIFACTS_BUCKET

‎build/lib/update_checksum_docker.sh

-37
This file was deleted.

0 commit comments

Comments
 (0)