From 2e7d24cae815cdb01931701b28bc27c9865e536f Mon Sep 17 00:00:00 2001 From: Jean-Pierre Huynh Date: Thu, 29 Jun 2017 22:32:01 +0100 Subject: [PATCH] Reword to remove ambiguity with go validate Signed-off-by: Jean-Pierre Huynh --- docker.Makefile | 10 +++++----- .../{Dockerfile.validate => Dockerfile.shellcheck} | 0 2 files changed, 5 insertions(+), 5 deletions(-) rename dockerfiles/{Dockerfile.validate => Dockerfile.shellcheck} (100%) diff --git a/docker.Makefile b/docker.Makefile index e7d8042823..88167f1c44 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -7,7 +7,7 @@ DEV_DOCKER_IMAGE_NAME = docker-cli-dev LINTER_IMAGE_NAME = docker-cli-lint CROSS_IMAGE_NAME = docker-cli-cross -VALIDATE_IMAGE_NAME = docker-cli-validate +VALIDATE_IMAGE_NAME = docker-cli-shell-validate MOUNTS = -v "$(CURDIR)":/go/src/github.com/docker/cli VERSION = $(shell cat VERSION) ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT @@ -26,9 +26,9 @@ build_linter_image: build_cross_image: docker build -t $(CROSS_IMAGE_NAME) -f ./dockerfiles/Dockerfile.cross . -.PHONY: build_validate_image -build_validate_image: - docker build -t $(VALIDATE_IMAGE_NAME) -f ./dockerfiles/Dockerfile.validate . +.PHONY: build_shell_validate_image +build_shell_validate_image: + docker build -t $(VALIDATE_IMAGE_NAME) -f ./dockerfiles/Dockerfile.shellcheck . # build executable using a container binary: build_docker_image @@ -86,5 +86,5 @@ yamldocs: build_docker_image docker run -ti --rm $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make yamldocs .PHONY: shellcheck -shellcheck: build_validate_image +shellcheck: build_shell_validate_image docker run -ti --rm -v "$(CURDIR)":/tmp $(VALIDATE_IMAGE_NAME) make shellcheck diff --git a/dockerfiles/Dockerfile.validate b/dockerfiles/Dockerfile.shellcheck similarity index 100% rename from dockerfiles/Dockerfile.validate rename to dockerfiles/Dockerfile.shellcheck