From e4b16a5a18901a078368a93eca2a7ee28ff2fa29 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Thu, 6 Oct 2016 18:25:00 -0700
Subject: [PATCH] Make sure rsync.sh is executable inside the build image

Also make sure /etc/localtime is readable

Also move BUILD_IMAGE_VERSION to build-image/VERSION to be consistent
with the way the cross-image works.
---
 build/BUILD_IMAGE_VERSION    | 1 -
 build/build-image/Dockerfile | 8 ++++++--
 build/build-image/VERSION    | 1 +
 build/common.sh              | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)
 delete mode 100644 build/BUILD_IMAGE_VERSION
 create mode 100644 build/build-image/VERSION

diff --git a/build/BUILD_IMAGE_VERSION b/build/BUILD_IMAGE_VERSION
deleted file mode 100644
index 00750edc07d..00000000000
--- a/build/BUILD_IMAGE_VERSION
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile
index 62a03b00a59..aec44f19b5c 100644
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -15,8 +15,6 @@
 # This file creates a standard build environment for building Kubernetes
 FROM gcr.io/google_containers/kube-cross:KUBE_BUILD_IMAGE_CROSS_TAG
 
-ADD localtime /etc/localtime
-
 # Mark this as a kube-build container
 RUN touch /kube-build-image
 
@@ -34,6 +32,12 @@ ENV KUBE_OUTPUT_SUBPATH _output/dockerized
 # Pick up version stuff here as we don't copy our .git over.
 ENV KUBE_GIT_VERSION_FILE ${HOME}/.dockerized-kube-version-defs
 
+# Make log messages use the right timezone
+ADD localtime /etc/localtime
+RUN chmod a+r /etc/localtime
+
+# Set up rsyncd
 ADD rsyncd.password /
 RUN chmod a+r /rsyncd.password
 ADD rsyncd.sh /
+RUN chmod a+rx /rsyncd.sh
diff --git a/build/build-image/VERSION b/build/build-image/VERSION
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/build/build-image/VERSION
@@ -0,0 +1 @@
+4
diff --git a/build/common.sh b/build/common.sh
index 92dca5e886c..11a796a791c 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -49,7 +49,7 @@ readonly KUBE_BUILD_IMAGE_CROSS_TAG="$(cat ${KUBE_ROOT}/build/build-image/cross/
 #
 # Increment/change this number if you change the build image (anything under
 # build/build-image) or change the set of volumes in the data container.
-readonly KUBE_BUILD_IMAGE_VERSION_BASE="$(cat ${KUBE_ROOT}/build/BUILD_IMAGE_VERSION)"
+readonly KUBE_BUILD_IMAGE_VERSION_BASE="$(cat ${KUBE_ROOT}/build/build-image/VERSION)"
 readonly KUBE_BUILD_IMAGE_VERSION="${KUBE_BUILD_IMAGE_VERSION_BASE}-${KUBE_BUILD_IMAGE_CROSS_TAG}"
 
 # Here we map the output directories across both the local and remote _output