diff options
| author | mo khan <mo.khan@gmail.com> | 2020-02-20 16:35:27 -0700 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-02-20 16:35:27 -0700 |
| commit | 3bcad0265e0a00d083f44bc42adbdbca77cffbcd (patch) | |
| tree | eed70805982d718427540c202788d70cbaa0a738 /bin/docker-build | |
| parent | 87bc4c78940f28e3dd5a71ca549ae595c41e8351 (diff) | |
Extract TOOLS_IMAGE build arg
Diffstat (limited to 'bin/docker-build')
| -rwxr-xr-x | bin/docker-build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/docker-build b/bin/docker-build index 1a4a985..64486b9 100755 --- a/bin/docker-build +++ b/bin/docker-build @@ -5,7 +5,7 @@ set -e cd "$(dirname "$0")/.." IMAGE_NAME=${IMAGE_NAME:-$(basename "$PWD"):latest} -TOOLS_IMAGE=${TOOLS_IMAGE:-registry.gitlab.com/gitlab-org/security-products/license-management/tools:latest} +TOOLS_IMAGE=${TOOLS_IMAGE:-$(basename "$PWD")/tools:master} docker build -t "$TOOLS_IMAGE" -f Dockerfile.tools --pull . -docker build --cache-from "$TOOLS_IMAGE" -t "$IMAGE_NAME" . +docker build --build-arg TOOLS_IMAGE="$TOOLS_IMAGE" -t "$IMAGE_NAME" . |