From 1a231edd97980f992213267ccea27150617fdf9c Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Wed, 19 Aug 2020 08:58:13 -0700 Subject: [PATCH] fix building k8s-image under drone (#203) --- Dockerfile.k8s | 2 +- scripts/version.sh | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.k8s b/Dockerfile.k8s index 06632671a1..dcd71caae7 100644 --- a/Dockerfile.k8s +++ b/Dockerfile.k8s @@ -13,7 +13,7 @@ RUN apt update && \ RUN git clone -b ${KUBERNETES_VERSION} --depth=1 https://github.com/kubernetes/kubernetes.git && \ cd /go/kubernetes && \ - KUBE_GIT_VERSION=${TAG} make all + KUBE_GIT_VERSION=${KUBERNETES_VERSION} make all FROM ubi RUN microdnf update -y && \ diff --git a/scripts/version.sh b/scripts/version.sh index 2c011d84e9..40a7e135fd 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -50,7 +50,6 @@ fi if [[ -n "$GIT_TAG" ]]; then VERSION=$GIT_TAG - KUBERNETES_VERSION=$GIT_TAG else VERSION="${KUBERNETES_VERSION}-dev+${COMMIT:0:8}$DIRTY" fi