GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/docker: Replace all variables in Dockerfile 

When updating the variables in the dockerfile, if there were two or more
variables on a line, only the first would be updated.  This fixes that
issue.

Change-Id: I011ccb299c7c8527b79d234075cab18be998ab43
Signed-off-by: Martin Roth <gaumless@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47339
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Martin Roth 2020-11-07 15:12:30 -07:00 committed by Martin Roth
parent 0728c46925
commit d736b1a607
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/docker/Makefile
View File

@ -43,9 +43,9 @@ test-docker-login: test-docker
coreboot-sdk: test-docker coreboot-sdk: test-docker
@echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)" @echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)"
cat coreboot-sdk/Dockerfile | \ cat coreboot-sdk/Dockerfile | \
sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \ sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/g" | \
sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \ sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/g" | \
sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \ sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/g" | \
$(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) - $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) -
upload-coreboot-sdk: test-docker-login upload-coreboot-sdk: test-docker-login
@ -53,7 +53,7 @@ upload-coreboot-sdk: test-docker-login
coreboot-jenkins-node: test-docker coreboot-jenkins-node: test-docker
cat coreboot-jenkins-node/Dockerfile | \ cat coreboot-jenkins-node/Dockerfile | \
sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \ sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/g" | \
sed "s|{{SSH_KEY}}|$$(cat coreboot-jenkins-node/authorized_keys)|" | \ sed "s|{{SSH_KEY}}|$$(cat coreboot-jenkins-node/authorized_keys)|" | \
$(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) - $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) -