From 3bcad0265e0a00d083f44bc42adbdbca77cffbcd Mon Sep 17 00:00:00 2001
From: mo khan <mo.khan@gmail.com>
Date: Thu, 20 Feb 2020 16:35:27 -0700
Subject: Extract TOOLS_IMAGE build arg

---
 bin/docker-build | 4 ++--
 bin/lint         | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin')

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" .
diff --git a/bin/lint b/bin/lint
index 3b6db15..faf1cd4 100755
--- a/bin/lint
+++ b/bin/lint
@@ -1,6 +1,7 @@
 #!/bin/sh
 
+shellcheck bin/*
+shellcheck config/*.sh
 shellcheck config/.bashrc
 shellcheck config/.profile
-shellcheck config/*.sh
 # shellcheck run.sh
-- 
cgit v1.2.3