sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/docker: Replace use of sed with build args

Browse Source 
Change-Id: I9ab101e06ed670dfe6802f9bd0df128d056446db
Signed-off-by: Tim Crawford <tcrawford@system76.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/77540
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Tim Crawford
2023-08-29 08:29:40 -06:00
committed by Felix Held
parent e352ea1ccd
commit d3a89cdb74
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
util/docker/Makefile
View File

@@ -42,17 +42,19 @@ test-docker-login: test-docker
coreboot-sdk: test-docker
@echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)"
cat coreboot-sdk/Dockerfile | \
sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/g" | \
sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/g" | \
sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/g" | \
$(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) -
$(DOCKER) build \
--tag coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) \
--build-arg=SDK_VERSION="$(SDK_VERSION)" \
--build-arg=DOCKER_COMMIT="$(DOCKER_COMMIT)" \
--build-arg=CROSSGCC_PARAM="$(COREBOOT_CROSSGCC_PARAM)" \
coreboot-sdk
coreboot-jenkins-test: test-docker
@echo "Testing coreboot SDK and jenkins node version $(crossgcc_version), built from commit $(DOCKER_COMMIT)"
cat coreboot-jenkins-test/Dockerfile | \
sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/g" | \
$(DOCKER) build -t coreboot/coreboot-jenkins-test:$(COREBOOT_IMAGE_TAG) -
$(DOCKER) build \
--tag coreboot/coreboot-jenkins-test:$(COREBOOT_IMAGE_TAG) \
--build-arg=SDK_VERSION="$(COREBOOT_IMAGE_TAG)" \
coreboot-jenkins-test
upload-coreboot-sdk: test-docker-login
$(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG)