Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47339 )
Change subject: util/docker: Replace all variables in Dockerfile ......................................................................
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 --- M util/docker/Makefile 1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/47339/1
diff --git a/util/docker/Makefile b/util/docker/Makefile index eaa26e1..1a83220 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -43,9 +43,9 @@ coreboot-sdk: test-docker @echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)" cat coreboot-sdk/Dockerfile | \ - sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \ - sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \ - sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \ + 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) -
upload-coreboot-sdk: test-docker-login @@ -53,7 +53,7 @@
coreboot-jenkins-node: test-docker 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)|" | \ $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) -
Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47339 )
Change subject: util/docker: Replace all variables in Dockerfile ......................................................................
Patch Set 1: Code-Review+1
Attention is currently required from: Martin Roth, Marshall Dawson. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47339 )
Change subject: util/docker: Replace all variables in Dockerfile ......................................................................
Patch Set 1: Code-Review+2
Martin Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47339 )
Change subject: util/docker: Replace all variables in Dockerfile ......................................................................
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 --- M util/docker/Makefile 1 file changed, 4 insertions(+), 4 deletions(-)
Approvals: build bot (Jenkins): Verified Frans Hendriks: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved
diff --git a/util/docker/Makefile b/util/docker/Makefile index a8fb571..87e21be 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -43,9 +43,9 @@ coreboot-sdk: test-docker @echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)" cat coreboot-sdk/Dockerfile | \ - sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \ - sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \ - sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \ + 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) -
upload-coreboot-sdk: test-docker-login @@ -53,7 +53,7 @@
coreboot-jenkins-node: test-docker 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)|" | \ $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) -
-
Angel Pons (Code Review) -
Frans Hendriks (Code Review)
-
Martin Roth (Code Review)