Skip to content

Commit

Permalink
add push / build scripts for base-image
Browse files Browse the repository at this point in the history
  • Loading branch information
BenTheElder committed Dec 20, 2019
1 parent 6f0ed39 commit f9868d4
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 7 deletions.
29 changes: 29 additions & 0 deletions images/base/build.sh
Original file line number Diff line number Diff line change
@@ -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}" .
15 changes: 8 additions & 7 deletions hack/release/build/push-base.sh → images/base/push.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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}"

0 comments on commit f9868d4

Please sign in to comment.