diff --git a/docker.Makefile b/docker.Makefile index 29d0ff3d1672..ba8c6dedca67 100644 --- a/docker.Makefile +++ b/docker.Makefile @@ -107,7 +107,7 @@ yamldocs: build_docker_image ## generate documentation YAML files consumed by do .PHONY: shellcheck shellcheck: build_shell_validate_image ## run shellcheck validation - docker run -ti --rm $(ENVVARS) $(MOUNTS) $(VALIDATE_IMAGE_NAME) make shellcheck + docker run -ti --rm $(ENVVARS) $(MOUNTS) $(VALIDATE_IMAGE_NAME) scripts/validate/shellcheck .PHONY: test-e2e ## run e2e tests test-e2e: test-e2e-non-experimental test-e2e-experimental test-e2e-connhelper-ssh diff --git a/dockerfiles/Dockerfile.shellcheck b/dockerfiles/Dockerfile.shellcheck index 4d0ddd333247..483c42b744c4 100644 --- a/dockerfiles/Dockerfile.shellcheck +++ b/dockerfiles/Dockerfile.shellcheck @@ -1,10 +1,2 @@ -FROM debian:stretch-slim - -RUN apt-get update && \ - apt-get -y install make shellcheck && \ - apt-get clean - +FROM koalaman/shellcheck-alpine:v0.4.7 WORKDIR /go/src/github.com/docker/cli -ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 -CMD bash -COPY . . diff --git a/scripts/validate/shellcheck b/scripts/validate/shellcheck index 63cedf137b5a..f8354a5e7376 100755 --- a/scripts/validate/shellcheck +++ b/scripts/validate/shellcheck @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh set -eo pipefail shellcheck contrib/completion/bash/docker