From 72948a3e4747ffbd68875e94c56a11ce6665db54 Mon Sep 17 00:00:00 2001 From: Long Dai Date: Fri, 21 May 2021 10:16:54 +0800 Subject: [PATCH] ci: optimize image build (#353) Signed-off-by: Long Dai --- Makefile | 16 ++++------------ hack/docker.sh | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) create mode 100755 hack/docker.sh diff --git a/Makefile b/Makefile index 8acd603a5..2484beee6 100644 --- a/Makefile +++ b/Makefile @@ -88,24 +88,16 @@ test: images: image-karmada-controller-manager image-karmada-scheduler image-karmada-webhook image-karmada-agent image-karmada-controller-manager: karmada-controller-manager - cp karmada-controller-manager cluster/images/karmada-controller-manager && \ - docker build -t $(REGISTRY)/karmada-controller-manager:$(VERSION) cluster/images/karmada-controller-manager && \ - rm cluster/images/karmada-controller-manager/karmada-controller-manager + VERSION=$(VERSION) hack/docker.sh karmada-controller-manager image-karmada-scheduler: karmada-scheduler - cp karmada-scheduler cluster/images/karmada-scheduler && \ - docker build -t $(REGISTRY)/karmada-scheduler:$(VERSION) cluster/images/karmada-scheduler && \ - rm cluster/images/karmada-scheduler/karmada-scheduler + VERSION=$(VERSION) hack/docker.sh karmada-scheduler image-karmada-webhook: karmada-webhook - cp karmada-webhook cluster/images/karmada-webhook && \ - docker build -t $(REGISTRY)/karmada-webhook:$(VERSION) cluster/images/karmada-webhook && \ - rm cluster/images/karmada-webhook/karmada-webhook + VERSION=$(VERSION) hack/docker.sh karmada-webhook image-karmada-agent: karmada-agent - cp karmada-agent cluster/images/karmada-agent && \ - docker build -t $(REGISTRY)/karmada-agent:$(VERSION) cluster/images/karmada-agent && \ - rm cluster/images/karmada-agent/karmada-agent + VERSION=$(VERSION) hack/docker.sh karmada-agent upload-images: images @echo "push images to $(REGISTRY)" diff --git a/hack/docker.sh b/hack/docker.sh new file mode 100755 index 000000000..dc352efc3 --- /dev/null +++ b/hack/docker.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +set -o errexit +set -o nounset +set -o pipefail + +# This script holds docker related functions. + +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +REGISTRY=${REGISTRY:-"swr.ap-southeast-1.myhuaweicloud.com/karmada"} +VERSION=${VERSION:="unknown"} + +function build_images() { + local target="$1" + docker build -t ${REGISTRY}/${target}:${VERSION} -f ${REPO_ROOT}/cluster/images/${target}/Dockerfile ${REPO_ROOT} +} + +build_images $@