@@ -398,9 +398,12 @@ photon-docker-image:

 		photon-build \

 		./support/dockerfiles/photon/make-docker-image.sh tdnf

-k8s-docker-images:

-	systemctl start docker && \

+start-docker: check-docker

+	systemctl start docker

+

+k8s-docker-images: start-docker photon-docker-image

 	cd ./support/dockerfiles/k8s-docker-images && \

+	./build-k8s-base-image.sh $(PHOTON_RELEASE_VERSION) $(PHOTON_BUILD_NUMBER) $(PHOTON_STAGE)  && \

 	./build-k8s-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

 	./build-k8s-dns-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

 	./build-k8s-dashboard-docker-images.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

new file mode 100644

@@ -0,0 +1,9 @@

+# k8s base container

+

+FROM scratch

+

+MAINTAINER kulkarniv@vmware.com

+

+ADD photon-rootfs-2.0.tar.bz2 /

+

+CMD ["/bin/sh"]

@@ -123,9 +123,9 @@ then

     exit 1

 fi

-CALICO_NODE_IMG_NAME=vmware_photon2/calico-node:v${CALICO_VER}

-CALICO_CNI_IMG_NAME=vmware_photon2/calico-cni:v${CALICO_CNI_VER}

-CALICO_K8S_POLICY_IMG_NAME=vmware_photon2/calico-kube-policy-controller:v${CALICO_K8S_POLICY_VER}

+CALICO_NODE_IMG_NAME=vmware_photon_${DIST_VER}/calico-node:v${CALICO_VER}

+CALICO_CNI_IMG_NAME=vmware_photon_${DIST_VER}/calico-cni:v${CALICO_CNI_VER}

+CALICO_K8S_POLICY_IMG_NAME=vmware_photon_${DIST_VER}/calico-kube-policy-controller:v${CALICO_K8S_POLICY_VER}

 NODE_IMG_ID=`docker images -q ${CALICO_NODE_IMG_NAME} 2> /dev/null`

 if [[ ! -z "${NODE_IMG_ID}" ]]; then

@@ -21,7 +21,7 @@ then

     exit 1

 fi

-IMG_NAME=vmware_photon2/flannel:v${FLANNEL_VER}

+IMG_NAME=vmware_photon_${DIST_VER}/flannel:v${FLANNEL_VER}

 IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

 if [[ ! -z "${IMG_ID}" ]]; then

new file mode 100755

@@ -0,0 +1,32 @@

+#!/bin/bash -e

+

+DIST_VER=$1

+BUILD_NUM=$2

+STAGE_DIR=$3

+

+#

+# Base docker image for kubernetes containers

+#

+PHOTON_ROOTFS_FILE=${STAGE_DIR}/photon-rootfs-${DIST_VER}-${BUILD_NUM}.tar.bz2

+K8S_BASE_IMG_NAME=k8s-base-image:${DIST_VER}

+

+if [ ! -f ${PHOTON_ROOTFS_FILE} ]

+then

+    echo "Photon rootfs file ${PHOTON_ROOTFS_FILE} not found. Exiting.."

+    exit 1

+fi

+

+IMG_ID=`docker images -q ${K8S_BASE_IMG_NAME} 2> /dev/null`

+if [[ ! -z "${IMG_ID}" ]]; then

+    echo "Removing image ${K8S_BASE_IMG_NAME}"

+    docker rmi -f ${K8S_BASE_IMG_NAME}

+fi

+

+mkdir -p tmp/k8sbase

+cp ${PHOTON_ROOTFS_FILE} tmp/k8sbase/photon-rootfs-${DIST_VER}.tar.bz2

+cp Dockerfile.k8sbase tmp/k8sbase/

+pushd ./tmp/k8sbase

+docker build --rm -t ${K8S_BASE_IMG_NAME} -f Dockerfile.k8sbase .

+popd

+

+rm -rf ./tmp

@@ -21,7 +21,7 @@ then

     exit 1

 fi

-IMG_NAME=vmware_photon2/kubernetes-dashboard-amd64:v${K8S_DASH_VER}

+IMG_NAME=vmware_photon_${DIST_VER}/kubernetes-dashboard-amd64:v${K8S_DASH_VER}

 IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

 if [[ ! -z "${IMG_ID}" ]]; then

@@ -22,7 +22,7 @@ then

 fi

 for K8S_BIN in ${K8S_DNS_BINS[*]}; do

-    IMG_NAME=vmware_photon2/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}

+    IMG_NAME=vmware_photon_${DIST_VER}/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}

     IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

     if [[ ! -z "${IMG_ID}" ]]; then

         echo "Removing image ${IMG_NAME}"

@@ -37,7 +37,7 @@ rpm2cpio ${K8S_DNS_RPM} | cpio -vid

 popd

 for K8S_BIN in ${K8S_DNS_BINS[*]}; do

-    IMG_NAME=vmware_photon2/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}

+    IMG_NAME=vmware_photon_${DIST_VER}/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}

     K8S_TAR_NAME=k8s-dns-${K8S_BIN}.tar

     docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .

     docker save -o ${K8S_TAR_NAME} ${IMG_NAME}

@@ -24,7 +24,7 @@ fi

 K8S_BINS=(kube-apiserver kube-controller-manager kube-proxy kube-scheduler)

 for K8S_BIN in ${K8S_BINS[*]}; do

-    IMG_NAME=vmware_photon2/${K8S_BIN}-amd64:v${K8S_VER}

+    IMG_NAME=vmware_photon_${DIST_VER}/${K8S_BIN}-amd64:v${K8S_VER}

     IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

     if [[ ! -z "${IMG_ID}" ]]; then

         echo "Removing image ${IMG_NAME}"

@@ -41,7 +41,7 @@ rpm2cpio ${K8S_PAUSE_RPM} | cpio -vid

 popd

 for K8S_BIN in ${K8S_BINS[*]}; do

-    IMG_NAME=vmware_photon2/${K8S_BIN}-amd64:v${K8S_VER}

+    IMG_NAME=vmware_photon_${DIST_VER}/${K8S_BIN}-amd64:v${K8S_VER}

     K8S_TAR_NAME=${K8S_BIN}.tar

     docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .

     docker save -o ${K8S_TAR_NAME} ${IMG_NAME}

@@ -52,7 +52,7 @@ done

 #

 # K8S Pause container

 #

-PAUSE_IMG_NAME=vmware_photon2/pause-amd64:2.0

+PAUSE_IMG_NAME=vmware_photon_${DIST_VER}/pause-amd64:2.0

 PAUSE_TAR_NAME=k8s-pause.tar

 PAUSE_IMG_ID=`docker images -q ${PAUSE_IMG_NAME} 2> /dev/null`

@@ -21,7 +21,7 @@ then

     exit 1

 fi

-IMG_NAME=vmware_photon2/nginx-ingress:v${NGINX_INC_VER}

+IMG_NAME=vmware_photon_${DIST_VER}/nginx-ingress:v${NGINX_INC_VER}

 IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`

 if [[ ! -z "${IMG_ID}" ]]; then