From f9868d45d27708f1f48bf9e5c212b896d7ebf562 Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Thu, 19 Dec 2019 16:08:59 -0800
Subject: [PATCH] add push / build scripts for base-image

---
 images/base/build.sh                          | 29 +++++++++++++++++++
 .../build/push-base.sh => images/base/push.sh | 15 +++++-----
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100755 images/base/build.sh
 rename hack/release/build/push-base.sh => images/base/push.sh (69%)

diff --git a/images/base/build.sh b/images/base/build.sh
new file mode 100755
index 0000000000..3ec3c0b7aa
--- /dev/null
+++ b/images/base/build.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#!/usr/bin/env bash
+# Copyright 2019 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit -o nounset -o pipefail
+
+# cd to the repo root
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
+cd "${REPO_ROOT}"
+
+# generate tag
+TAG="${TAG:-"$(date +v%Y%m%d)-$(git describe --always --dirty)"}"
+IMAGE="${IMAGE:-"kindest/base:${TAG}"}"
+
+# build
+cd "${REPO_ROOT}/images/base/"
+docker build --no-cache --pull -t "${IMAGE}" .
diff --git a/hack/release/build/push-base.sh b/images/base/push.sh
similarity index 69%
rename from hack/release/build/push-base.sh
rename to images/base/push.sh
index ece3b8a60e..04cc38c9d0 100755
--- a/hack/release/build/push-base.sh
+++ b/images/base/push.sh
@@ -1,5 +1,6 @@
+#!/bin/bash
 #!/usr/bin/env bash
-# Copyright 2018 The Kubernetes Authors.
+# Copyright 2019 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,18 +17,18 @@
 set -o errexit -o nounset -o pipefail
 
 # cd to the repo root
-REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd -P)"
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
 cd "${REPO_ROOT}"
 
-# ensure we have up to date kind
-make build
-
+set -x;
 # generate tag
-TAG="$(date +v%Y%m%d)-$(git describe --always --dirty)"
+TAG="${TAG:-"$(date +v%Y%m%d)-$(git describe --always --dirty)"}"
 IMAGE="kindest/base:${TAG}"
+export TAG
+export IMAGE
 
 # build
-(set -x; "${REPO_ROOT}/bin/kind" build base-image --image="${IMAGE}" --source="${REPO_ROOT}/images/base/")
+"${REPO_ROOT}"/images/base/build.sh
 
 # push
 docker push "${IMAGE}"