diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/docker-build | 4 | ||||
| -rwxr-xr-x | bin/lint | 3 |
2 files changed, 4 insertions, 3 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" . @@ -1,6 +1,7 @@ #!/bin/sh +shellcheck bin/* +shellcheck config/*.sh shellcheck config/.bashrc shellcheck config/.profile -shellcheck config/*.sh # shellcheck run.sh |