<p>Patrick Georgi <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/29458">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Patrick Georgi: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/docker: Rename _CONTAINER_VERSION => _IMAGE_TAG<br><br>This is so confusing, let's name it what it is ;)<br><br>Change-Id: I6f87e2f6912d886e241e03998fb4136fb28bc7b1<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>Reviewed-on: https://review.coreboot.org/29458<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Patrick Georgi <pgeorgi@google.com><br>---<br>M util/docker/Makefile<br>1 file changed, 12 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/docker/Makefile b/util/docker/Makefile</span><br><span>index eb43c98..6925b57 100644</span><br><span>--- a/util/docker/Makefile</span><br><span>+++ b/util/docker/Makefile</span><br><span>@@ -26,7 +26,7 @@</span><br><span> export COREBOOT_JENKINS_CONTAINER?=coreboot_jenkins</span><br><span> </span><br><span> # Version of the jenkins / sdk container</span><br><span style="color: hsl(0, 100%, 40%);">-export COREBOOT_CONTAINER_VERSION?=$(crossgcc_version)</span><br><span style="color: hsl(120, 100%, 40%);">+export COREBOOT_IMAGE_TAG?=$(crossgcc_version)</span><br><span> </span><br><span> # Commit id to build from</span><br><span> export DOCKER_COMMIT?=$(shell git log -n 1 --pretty=%h)</span><br><span>@@ -55,21 +55,21 @@</span><br><span> @echo "Building coreboot SDK $(crossgcc_version) from commit $(DOCKER_COMMIT)"</span><br><span> cat coreboot-sdk/Dockerfile | \</span><br><span> sed "s/{{DOCKER_COMMIT}}/$(DOCKER_COMMIT)/" | \</span><br><span style="color: hsl(0, 100%, 40%);">- sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \</span><br><span style="color: hsl(120, 100%, 40%);">+ sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \</span><br><span> sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \</span><br><span style="color: hsl(0, 100%, 40%);">- $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) -</span><br><span style="color: hsl(120, 100%, 40%);">+ $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) -</span><br><span> </span><br><span> upload-coreboot-sdk: test-docker-login</span><br><span style="color: hsl(0, 100%, 40%);">- $(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+ $(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG)</span><br><span> </span><br><span> coreboot-jenkins-node: test-docker</span><br><span> cat coreboot-jenkins-node/Dockerfile | \</span><br><span style="color: hsl(0, 100%, 40%);">- sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \</span><br><span style="color: hsl(120, 100%, 40%);">+ sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \</span><br><span> sed "s|{{SSH_KEY}}|$$(cat coreboot-jenkins-node/authorized_keys)|" | \</span><br><span style="color: hsl(0, 100%, 40%);">- $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) -</span><br><span style="color: hsl(120, 100%, 40%);">+ $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) -</span><br><span> </span><br><span> upload-coreboot-jenkins-node: test-docker-login</span><br><span style="color: hsl(0, 100%, 40%);">- $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+ $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG)</span><br><span> </span><br><span> docker-killall: test-docker</span><br><span> @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \</span><br><span>@@ -107,7 +107,7 @@</span><br><span> --volume $(top):/home/coreboot/coreboot \</span><br><span> --env HOME=/home/coreboot \</span><br><span> --user $(UID):$(GID) \</span><br><span style="color: hsl(0, 100%, 40%);">- coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \</span><br><span style="color: hsl(120, 100%, 40%);">+ coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) \</span><br><span> /bin/bash -c 'cd $${HOME}/coreboot && $(DOCKER_RUN_LOCAL)'</span><br><span> </span><br><span> docker-build-coreboot: docker-run-local</span><br><span>@@ -138,7 +138,7 @@</span><br><span> -p $(COREBOOT_JENKINS_PORT):49151 \</span><br><span> -v $(COREBOOT_JENKINS_CACHE_DIR):/data/cache \</span><br><span> --name=$(COREBOOT_JENKINS_CONTAINER) \</span><br><span style="color: hsl(0, 100%, 40%);">- coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+ coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG)</span><br><span> </span><br><span> docker-jenkins-shell: test-docker</span><br><span> @if [ ! -d $(COREBOOT_JENKINS_CACHE_DIR) ]; then printf "\nError: %s does not exist.\nPlease run:\nsudo mkdir -p %s\n\n" "$(COREBOOT_JENKINS_CACHE_DIR)" "$(COREBOOT_JENKINS_CACHE_DIR)"; false; fi</span><br><span>@@ -148,7 +148,7 @@</span><br><span> -v $(top):/home/coreboot/coreboot \</span><br><span> -v $(COREBOOT_JENKINS_CACHE_DIR):/data/cache \</span><br><span> --name=$(COREBOOT_JENKINS_CONTAINER) \</span><br><span style="color: hsl(0, 100%, 40%);">- --rm coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+ --rm coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG)</span><br><span> </span><br><span> docker-shell: USER=coreboot</span><br><span> docker-shell: test-docker</span><br><span>@@ -156,7 +156,7 @@</span><br><span> -e COLUMNS=$(shell tput cols) -e LINES=$(shell tput lines) -e TERM=$(TERM) \</span><br><span> -w /home/coreboot/coreboot \</span><br><span> -v $(top):/home/coreboot/coreboot \</span><br><span style="color: hsl(0, 100%, 40%);">- --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \</span><br><span style="color: hsl(120, 100%, 40%);">+ --rm coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) \</span><br><span> /bin/bash -l</span><br><span> </span><br><span> docker-jenkins-attach: USER=root</span><br><span>@@ -191,7 +191,7 @@</span><br><span> @echo " COREBOOT_JENKINS_PORT=$(COREBOOT_JENKINS_PORT)"</span><br><span> @echo " COREBOOT_JENKINS_CACHE_DIR=$(COREBOOT_JENKINS_CACHE_DIR)"</span><br><span> @echo " COREBOOT_JENKINS_CONTAINER=$(COREBOOT_JENKINS_CONTAINER)"</span><br><span style="color: hsl(0, 100%, 40%);">- @echo " COREBOOT_CONTAINER_VERSION=$(COREBOOT_CONTAINER_VERSION)"</span><br><span style="color: hsl(120, 100%, 40%);">+ @echo " COREBOOT_IMAGE_TAG=$(COREBOOT_IMAGE_TAG)"</span><br><span> @echo " DOCKER_COMMIT=$(DOCKER_COMMIT)"</span><br><span> </span><br><span> .PHONY: test-docker test-docker-login</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29458">change 29458</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29458"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6f87e2f6912d886e241e03998fb4136fb28bc7b1 </div>
<div style="display:none"> Gerrit-Change-Number: 29458 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>
<div style="display:none"> Gerrit-Reviewer: Arthur Heymans <arthur@aheymans.xyz> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>