diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-11-04 19:20:41 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-11-16 10:06:09 +0000 |
| commit | 9b1cbe040b1e502787d8d9576b9c8e567849d181 (patch) | |
| tree | bb08c35682b795c138d5270d6dd217b76f8d34ea /util | |
| parent | 9b731b5c08635580a8b8ade237bb62f4f4e6ac24 (diff) | |
util/docker: Rename _CONTAINER_VERSION => _IMAGE_TAG
This is so confusing, let's name it what it is ;)
Change-Id: I6f87e2f6912d886e241e03998fb4136fb28bc7b1
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/29458
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/docker/Makefile | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/util/docker/Makefile b/util/docker/Makefile index eb43c985ed..6925b57fdf 100644 --- a/util/docker/Makefile +++ b/util/docker/Makefile @@ -26,7 +26,7 @@ export COREBOOT_JENKINS_CACHE_DIR?=/srv/docker/coreboot-builder/cache export COREBOOT_JENKINS_CONTAINER?=coreboot_jenkins # Version of the jenkins / sdk container -export COREBOOT_CONTAINER_VERSION?=$(crossgcc_version) +export COREBOOT_IMAGE_TAG?=$(crossgcc_version) # Commit id to build from export DOCKER_COMMIT?=$(shell git log -n 1 --pretty=%h) @@ -55,21 +55,21 @@ 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_CONTAINER_VERSION)/" | \ + sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \ sed "s/{{CROSSGCC_PARAM}}/$(COREBOOT_CROSSGCC_PARAM)/" | \ - $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) - + $(DOCKER) build -t coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) - upload-coreboot-sdk: test-docker-login - $(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) + $(DOCKER) push coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) coreboot-jenkins-node: test-docker cat coreboot-jenkins-node/Dockerfile | \ - sed "s/{{SDK_VERSION}}/$(COREBOOT_CONTAINER_VERSION)/" | \ + sed "s/{{SDK_VERSION}}/$(COREBOOT_IMAGE_TAG)/" | \ sed "s|{{SSH_KEY}}|$$(cat coreboot-jenkins-node/authorized_keys)|" | \ - $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) - + $(DOCKER) build -t coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) - upload-coreboot-jenkins-node: test-docker-login - $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) + $(DOCKER) push coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) docker-killall: test-docker @if [ -n "$$($(DOCKER) ps | grep 'coreboot')" ]; then \ @@ -107,7 +107,7 @@ docker-run-local: test-docker $(DOCKER_CCACHE) --volume $(top):/home/coreboot/coreboot \ --env HOME=/home/coreboot \ --user $(UID):$(GID) \ - coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \ + coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) \ /bin/bash -c 'cd $${HOME}/coreboot && $(DOCKER_RUN_LOCAL)' docker-build-coreboot: docker-run-local @@ -138,7 +138,7 @@ docker-jenkins-server: test-docker -p $(COREBOOT_JENKINS_PORT):49151 \ -v $(COREBOOT_JENKINS_CACHE_DIR):/data/cache \ --name=$(COREBOOT_JENKINS_CONTAINER) \ - coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) + coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) docker-jenkins-shell: test-docker @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 @@ -148,7 +148,7 @@ docker-jenkins-shell: test-docker -v $(top):/home/coreboot/coreboot \ -v $(COREBOOT_JENKINS_CACHE_DIR):/data/cache \ --name=$(COREBOOT_JENKINS_CONTAINER) \ - --rm coreboot/coreboot-jenkins-node:$(COREBOOT_CONTAINER_VERSION) + --rm coreboot/coreboot-jenkins-node:$(COREBOOT_IMAGE_TAG) docker-shell: USER=coreboot docker-shell: test-docker @@ -156,7 +156,7 @@ docker-shell: test-docker -e COLUMNS=$(shell tput cols) -e LINES=$(shell tput lines) -e TERM=$(TERM) \ -w /home/coreboot/coreboot \ -v $(top):/home/coreboot/coreboot \ - --rm coreboot/coreboot-sdk:$(COREBOOT_CONTAINER_VERSION) \ + --rm coreboot/coreboot-sdk:$(COREBOOT_IMAGE_TAG) \ /bin/bash -l docker-jenkins-attach: USER=root @@ -191,7 +191,7 @@ help: @echo " COREBOOT_JENKINS_PORT=$(COREBOOT_JENKINS_PORT)" @echo " COREBOOT_JENKINS_CACHE_DIR=$(COREBOOT_JENKINS_CACHE_DIR)" @echo " COREBOOT_JENKINS_CONTAINER=$(COREBOOT_JENKINS_CONTAINER)" - @echo " COREBOOT_CONTAINER_VERSION=$(COREBOOT_CONTAINER_VERSION)" + @echo " COREBOOT_IMAGE_TAG=$(COREBOOT_IMAGE_TAG)" @echo " DOCKER_COMMIT=$(DOCKER_COMMIT)" .PHONY: test-docker test-docker-login |