diff options
| author | Can Eldem <celdem@gitlab.com> | 2020-02-27 16:49:42 +0000 |
|---|---|---|
| committer | Can Eldem <celdem@gitlab.com> | 2020-02-27 16:49:42 +0000 |
| commit | b04960caaf1abe23bc03d96688267f79aa6613a1 (patch) | |
| tree | 199103717826b9bcdf088fc062af1fe679ee8be8 /bin/docker-build | |
| parent | c459a6d76a0f540ac4c5345d6f6124769aa55184 (diff) | |
| parent | b3563987c1c0aaa37b827713a291b53bd6048a4b (diff) | |
Merge branch '202126-gradle-specs' into 'master'v2.7.0
Ensure the `license-gradle-plugin` shim works across different versions of gradle
See merge request gitlab-org/security-products/license-management!118
Diffstat (limited to 'bin/docker-build')
| -rwxr-xr-x | bin/docker-build | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bin/docker-build b/bin/docker-build index 428dda8..1751c74 100755 --- a/bin/docker-build +++ b/bin/docker-build @@ -4,6 +4,12 @@ set -e cd "$(dirname "$0")/.." -IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} +if command -v docker; then + IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} + + docker build . -t "$IMAGE_NAME" --pull +else + echo "Install docker: https://docs.docker.com/engine/installation/" + exit 1 +fi -docker build . -t "$IMAGE_NAME" --pull |