GitList

Browse code

Rename docker images to include version info

Change-Id: I2a5277b593e2b223d5b0c3275bf83eb401ae83b3
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4046
Reviewed-by: Kumar Kaushik <kaushikk@vmware.com>
Reviewed-by: Dheeraj S Shetty <dheerajs@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Vinay Kulkarni authored on 2017/10/12 10:17:18
Showing 21 changed files

support/dockerfiles/k8s-docker-images/Dockerfile.calico-cni index e673094..c238f74 100644
support/dockerfiles/k8s-docker-images/Dockerfile.calico-k8s-policy index 82a4dc8..41ae48d 100644
support/dockerfiles/k8s-docker-images/Dockerfile.calico-node index 2a904b1..e64e1c6 100644
support/dockerfiles/k8s-docker-images/Dockerfile.dnsmasq-nanny index 81a3b5f..8107720 100644
support/dockerfiles/k8s-docker-images/Dockerfile.flannel index e0e3c55..5e20f0f 100644
support/dockerfiles/k8s-docker-images/Dockerfile.heapster index 3c0c1c2..14947fa 100644
support/dockerfiles/k8s-docker-images/Dockerfile.kube-apiserver index e5747a9..fe88838 100644
support/dockerfiles/k8s-docker-images/Dockerfile.kube-dns index 137ce0d..ce7daf9 100644
support/dockerfiles/k8s-docker-images/Dockerfile.kube-proxy index 36ab9a6..1861908 100644
support/dockerfiles/k8s-docker-images/Dockerfile.kube-scheduler index d5442f3..cd65cee 100644
support/dockerfiles/k8s-docker-images/Dockerfile.nginx-ingress index 5b48916..76f6266 100644
support/dockerfiles/k8s-docker-images/Dockerfile.sidecar index 62f55a9..8bca3aa 100644
support/dockerfiles/k8s-docker-images/Dockerfile.wavefront-proxy index cb13261..9f7b0c3 100644
support/dockerfiles/k8s-docker-images/build-calico-docker-images.sh index 488f00d..27bc56a 100755
support/dockerfiles/k8s-docker-images/build-flannel-docker-image.sh index 78b17a2..2898366 100755
support/dockerfiles/k8s-docker-images/build-k8s-dashboard-docker-images.sh index 9325033..a6ec539 100755
support/dockerfiles/k8s-docker-images/build-k8s-dns-docker-images.sh index 536fb06..17b0307 100755
support/dockerfiles/k8s-docker-images/build-k8s-docker-images.sh index 6680531..0891211 100755
support/dockerfiles/k8s-docker-images/build-k8s-heapster-image.sh index 41b20d1..e35e827 100755
support/dockerfiles/k8s-docker-images/build-k8s-nginx-ingress.sh index 056b79a..fa73a2f 100755
support/dockerfiles/k8s-docker-images/build-wavefront-proxy-docker-image.sh index 2055184..06005c1 100755

@@ -1,4 +1,4 @@
                     -FROM vmware/photon
                     +FROM vmware/photon:2.0
                      MAINTAINER kulkarniv@vmware.com

@@ -6,10 +6,6 @@ SPEC_DIR=$3
                      STAGE_DIR=$4
                      ARCH=x86_64
                     -CALICO_NODE_TAR=calico-node.tar
                     -CALICO_CNI_TAR=calico-cni.tar
                     -CALICO_K8S_POLICY_TAR=calico-k8s-policy.tar
+                    -
+                     #
                      # Docker images for calico-node, calico-cni
+                     #
@@ -126,6 +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
                      NODE_IMG_ID=`docker images -q ${CALICO_NODE_IMG_NAME} 2> /dev/null`
                      if [[ ! -z "${NODE_IMG_ID}" ]]; then

@@ -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.tar
                     +FLANNEL_TAR=flannel-v${FLANNEL_VER}.tar
                      if [ ! -f ${FLANNEL_RPM_FILE} ]
                      then

@@ -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.tar
                     +K8S_DASH_TAR=kubernetes-dashboard-v${K8S_DASH_VER}.tar
                      if [ ! -f ${K8S_DASH_RPM_FILE} ]
                      then

@@ -38,7 +38,7 @@ 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}.tar
                     +    K8S_TAR_NAME=k8s-dns-${K8S_BIN}-${K8S_DNS_VER}.tar
                          docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .
                          docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
                          gzip ${K8S_TAR_NAME}

@@ -42,7 +42,7 @@ 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}.tar
                     +    K8S_TAR_NAME=${K8S_BIN}-v${K8S_VER}.tar
                          docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .
                          docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
                          gzip ${K8S_TAR_NAME}
@@ -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.tar
                     +PAUSE_TAR_NAME=k8s-pause-v${K8S_VER}.tar
                      PAUSE_IMG_ID=`docker images -q ${PAUSE_IMG_NAME} 2> /dev/null`
                      if [[ ! -z "${PAUSE_IMG_ID}" ]]; then

@@ -34,7 +34,7 @@ pushd ./tmp/k8heapster
                      rpm2cpio ${K8S_HEAPSTER_RPM} | cpio -vid
                      popd
                     -K8S_TAR_NAME=k8s-heapster.tar
                     +K8S_TAR_NAME=k8s-heapster-${K8S_HEAPSTER_VER}.tar
                      docker build --rm -t ${IMG_NAME} -f ./Dockerfile.heapster .
                      docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
                      gzip ${K8S_TAR_NAME}

@@ -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.tar
                     +NGINX_INC_TAR=nginx-ingress-v${NGINX_INC_VER}.tar
                      if [ ! -f ${NGINX_INC_RPM_FILE} ]
                      then

@@ -13,7 +13,7 @@ WAVEFRONT_PROXY_VER=`cat ${SPEC_DIR}/wavefront-proxy/wavefront-proxy.spec | grep
                      WAVEFRONT_PROXY_VER_REL=${WAVEFRONT_PROXY_VER}-`cat ${SPEC_DIR}/wavefront-proxy/wavefront-proxy.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`
                      WAVEFRONT_PROXY_RPM=wavefront-proxy-${WAVEFRONT_PROXY_VER_REL}${DIST_TAG}.${ARCH}.rpm
                      WAVEFRONT_PROXY_RPM_FILE=${STAGE_DIR}/RPMS/${ARCH}/${WAVEFRONT_PROXY_RPM}
                     -WAVEFRONT_PROXY_TAR=wavefront-proxy.tar
                     +WAVEFRONT_PROXY_TAR=wavefront-proxy-v${WAVEFRONT_PROXY_VER}.tar
                      if [ ! -f ${WAVEFRONT_PROXY_RPM_FILE} ]
                      then