Merge pull request #12998 from hexfusion/cp-12997

Manual cherry pick of #12997
etcd-io · May 18, 2021 · 163d9fd · 163d9fd
2 parents 1a8a063 + d06c972
commit 163d9fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/scripts/build-docker b/scripts/build-docker
@@ -30,7 +30,7 @@ IMAGEDIR=${BUILDDIR}/image-docker
 
 mkdir -p "${IMAGEDIR}"/var/etcd
 mkdir -p "${IMAGEDIR}"/var/lib/etcd
-cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${IMAGEDIR}"
+cp "${BINARYDIR}"/etcd "${BINARYDIR}"/etcdctl "${BINARYDIR}"/etcdutl "${IMAGEDIR}"
 
 cat ./"${DOCKERFILE}" > "${IMAGEDIR}"/Dockerfile
 

diff --git a/scripts/release b/scripts/release
@@ -193,6 +193,7 @@ main() {
   # Sanity checks.
   "./release/etcd-${RELEASE_VERSION}-$(go env GOOS)-amd64/etcd" --version | grep -q "etcd Version: ${VERSION}" || true
   "./release/etcd-${RELEASE_VERSION}-$(go env GOOS)-amd64/etcdctl" version | grep -q "etcdctl version: ${VERSION}" || true
+  "./release/etcd-${RELEASE_VERSION}-$(go env GOOS)-amd64/etcdutl" version | grep -q "etcdutl version: ${VERSION}" || true
 
   # Generate SHA256SUMS
   log_callout "Generating sha256sums of release artifacts."