diff options
| author | Martin Roth <gaumless@gmail.com> | 2020-11-07 15:12:30 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2021-01-22 21:27:44 +0000 |
| commit | d736b1a607bbb1d6002457f15fb13cc0b37609c6 (patch) | |
| tree | 7c7f6f6415d029f99d13a4298cfc6b5f64d60353 | |
| parent | 0728c46925797edb513f84b0b0158ad07ec56c1f (diff) | |
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>
| -rw-r--r-- | util/docker/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/util/docker/Makefile b/util/docker/Makefile index a8fb571824..87e21be8b1 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -43,9 +43,9 @@ 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)/" | \ - 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 @@ upload-coreboot-sdk: test-docker-login 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) - |