@@ -402,6 +402,7 @@ photon-docker-image:

 k8s-docker-images:

 	systemctl start docker && \

+	mkdir -p $(PHOTON_STAGE)/docker_images && \

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

 	./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) && \

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM scratch

 MAINTAINER kulkarniv@vmware.com

@@ -1,5 +1,3 @@

-# Photon Base Build Container

-

 FROM vmware/photon:1.0

 MAINTAINER kulkarniv@vmware.com

@@ -122,9 +122,9 @@ fi

 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}

-CALICO_NODE_TAR=calico-node-v${CALICO_VER}.tar

-CALICO_CNI_TAR=calico-cni-v${CALICO_CNI_VER}.tar

-CALICO_K8S_POLICY_TAR=calico-k8s-policy-v${CALICO_K8S_POLICY_VER}.tar

+CALICO_NODE_TAR=calico-node-v${CALICO_VER_REL}.tar

+CALICO_CNI_TAR=calico-cni-v${CALICO_CNI_VER_REL}.tar

+CALICO_K8S_POLICY_TAR=calico-k8s-policy-v${CALICO_K8S_POLICY_VER_REL}.tar

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

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

@@ -165,16 +165,16 @@ popd

 docker build --rm -t ${CALICO_NODE_IMG_NAME} -f Dockerfile.calico-node .

 docker save -o ${CALICO_NODE_TAR} ${CALICO_NODE_IMG_NAME}

 gzip ${CALICO_NODE_TAR}

-mv -f ${CALICO_NODE_TAR}.gz ${STAGE_DIR}/

+mv -f ${CALICO_NODE_TAR}.gz ${STAGE_DIR}/docker_images/

 docker build --rm -t ${CALICO_CNI_IMG_NAME} -f Dockerfile.calico-cni .

 docker save -o ${CALICO_CNI_TAR} ${CALICO_CNI_IMG_NAME}

 gzip ${CALICO_CNI_TAR}

-mv -f ${CALICO_CNI_TAR}.gz ${STAGE_DIR}/

+mv -f ${CALICO_CNI_TAR}.gz ${STAGE_DIR}/docker_images/

 docker build --rm -t ${CALICO_K8S_POLICY_IMG_NAME} -f Dockerfile.calico-k8s-policy .

 docker save -o ${CALICO_K8S_POLICY_TAR} ${CALICO_K8S_POLICY_IMG_NAME}

 gzip ${CALICO_K8S_POLICY_TAR}

-mv -f ${CALICO_K8S_POLICY_TAR}.gz ${STAGE_DIR}/

+mv -f ${CALICO_K8S_POLICY_TAR}.gz ${STAGE_DIR}/docker_images/

 rm -rf ./tmp

@@ -13,7 +13,7 @@ FLANNEL_VER=`cat ${SPEC_DIR}/flannel/flannel.spec | grep Version | cut -d: -f2 |

 FLANNEL_VER_REL=${FLANNEL_VER}-`cat ${SPEC_DIR}/flannel/flannel.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

 FLANNEL_RPM=flannel-${FLANNEL_VER_REL}${DIST_TAG}.${ARCH}.rpm

 FLANNEL_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${FLANNEL_RPM}

-FLANNEL_TAR=flannel-v${FLANNEL_VER}.tar

+FLANNEL_TAR=flannel-v${FLANNEL_VER_REL}.tar

 if [ ! -f ${FLANNEL_RPM_FILE} ]

 then

@@ -37,6 +37,6 @@ popd

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

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

 gzip ${FLANNEL_TAR}

-mv -f ${FLANNEL_TAR}.gz ${STAGE_DIR}/

+mv -f ${FLANNEL_TAR}.gz ${STAGE_DIR}/docker_images/

 rm -rf ./tmp

@@ -13,7 +13,7 @@ K8S_DASH_VER=`cat ${SPEC_DIR}/kubernetes-dashboard/kubernetes-dashboard.spec | g

 K8S_DASH_VER_REL=${K8S_DASH_VER}-`cat ${SPEC_DIR}/kubernetes-dashboard/kubernetes-dashboard.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

 K8S_DASH_RPM=kubernetes-dashboard-${K8S_DASH_VER_REL}${DIST_TAG}.${ARCH}.rpm

 K8S_DASH_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${K8S_DASH_RPM}

-K8S_DASH_TAR=kubernetes-dashboard-v${K8S_DASH_VER}.tar

+K8S_DASH_TAR=kubernetes-dashboard-v${K8S_DASH_VER_REL}.tar

 if [ ! -f ${K8S_DASH_RPM_FILE} ]

 then

@@ -40,7 +40,7 @@ cd img

 docker build --rm -t ${IMG_NAME} .

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

 gzip ${K8S_DASH_TAR}

-mv -f ${K8S_DASH_TAR}.gz ${STAGE_DIR}/

+mv -f ${K8S_DASH_TAR}.gz ${STAGE_DIR}/docker_images/

 popd

 rm -rf ./tmp

@@ -38,11 +38,11 @@ popd

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

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

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

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

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

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

     gzip ${K8S_TAR_NAME}

-    mv -f ${K8S_TAR_NAME}.gz ${STAGE_DIR}/

+    mv -f ${K8S_TAR_NAME}.gz ${STAGE_DIR}/docker_images/

 done

 rm -rf ./tmp

@@ -42,11 +42,11 @@ popd

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

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

-    K8S_TAR_NAME=${K8S_BIN}-v${K8S_VER}.tar

+    K8S_TAR_NAME=${K8S_BIN}-v${K8S_VER_REL}.tar

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

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

     gzip ${K8S_TAR_NAME}

-    mv -f ${K8S_TAR_NAME}.gz ${STAGE_DIR}/

+    mv -f ${K8S_TAR_NAME}.gz ${STAGE_DIR}/docker_images/

 done

@@ -54,7 +54,7 @@ done

 # K8S Pause container

 #

 PAUSE_IMG_NAME=vmware_photon_${DIST_VER}/pause-amd64:v${K8S_VER}

-PAUSE_TAR_NAME=k8s-pause-v${K8S_VER}.tar

+PAUSE_TAR_NAME=k8s-pause-v${K8S_VER_REL}.tar

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

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

@@ -65,6 +65,6 @@ fi

 docker build --rm -t ${PAUSE_IMG_NAME} -f ./Dockerfile.pause .

 docker save -o ${PAUSE_TAR_NAME} ${PAUSE_IMG_NAME}

 gzip ${PAUSE_TAR_NAME}

-mv -f ${PAUSE_TAR_NAME}.gz ${STAGE_DIR}/

+mv -f ${PAUSE_TAR_NAME}.gz ${STAGE_DIR}/docker_images/

 rm -rf ./tmp

@@ -13,7 +13,7 @@ NGINX_INC_VER=`cat ${SPEC_DIR}/nginx-ingress/nginx-ingress.spec | grep Version |

 NGINX_INC_VER_REL=${NGINX_INC_VER}-`cat ${SPEC_DIR}/nginx-ingress/nginx-ingress.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

 NGINX_INC_RPM=nginx-ingress-${NGINX_INC_VER_REL}${DIST_TAG}.${ARCH}.rpm

 NGINX_INC_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${NGINX_INC_RPM}

-NGINX_INC_TAR=nginx-ingress-v${NGINX_INC_VER}.tar

+NGINX_INC_TAR=nginx-ingress-v${NGINX_INC_VER_REL}.tar

 if [ ! -f ${NGINX_INC_RPM_FILE} ]

 then

@@ -37,6 +37,6 @@ popd

 docker build --rm -t ${IMG_NAME} -f Dockerfile.nginx-ingress .

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

 gzip ${NGINX_INC_TAR}

-mv -f ${NGINX_INC_TAR}.gz ${STAGE_DIR}/

+mv -f ${NGINX_INC_TAR}.gz ${STAGE_DIR}/docker_images/

 rm -rf ./tmp