Browse code
k8s docker image naming fix
Change-Id: I134e9166216f1df9613b71cccccbc0daaae7d919
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4272
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>
Reviewed-by: Dheeraj S Shetty <dheerajs@vmware.com>
Vinay Kulkarni authored on 2017/11/12 14:27:29Showing 8 changed files
- support/dockerfiles/k8s-docker-images/build-calico-docker-images.sh
- support/dockerfiles/k8s-docker-images/build-flannel-docker-image.sh
- support/dockerfiles/k8s-docker-images/build-k8s-dashboard-docker-images.sh
- support/dockerfiles/k8s-docker-images/build-k8s-dns-docker-images.sh
- support/dockerfiles/k8s-docker-images/build-k8s-docker-images.sh
- support/dockerfiles/k8s-docker-images/build-k8s-heapster-image.sh
- support/dockerfiles/k8s-docker-images/build-k8s-nginx-ingress.sh
- support/dockerfiles/k8s-docker-images/build-wavefront-proxy-docker-image.sh
| ... | ... |
@@ -121,9 +121,9 @@ then |
| 121 | 121 |
exit 1 |
| 122 | 122 |
fi |
| 123 | 123 |
|
| 124 |
-CALICO_NODE_IMG_NAME=vmware_photon_${DIST_VER}/calico-node:v${CALICO_VER}
|
|
| 125 |
-CALICO_CNI_IMG_NAME=vmware_photon_${DIST_VER}/calico-cni:v${CALICO_CNI_VER}
|
|
| 126 |
-CALICO_K8S_POLICY_IMG_NAME=vmware_photon_${DIST_VER}/calico-kube-policy-controller:v${CALICO_K8S_POLICY_VER}
|
|
| 124 |
+CALICO_NODE_IMG_NAME=vmware/photon-${DIST_VER}-calico-node:v${CALICO_VER}
|
|
| 125 |
+CALICO_CNI_IMG_NAME=vmware/photon-${DIST_VER}-calico-cni:v${CALICO_CNI_VER}
|
|
| 126 |
+CALICO_K8S_POLICY_IMG_NAME=vmware/photon-${DIST_VER}-calico-kube-policy-controller:v${CALICO_K8S_POLICY_VER}
|
|
| 127 | 127 |
CALICO_NODE_TAR=calico-node-v${CALICO_VER_REL}.tar
|
| 128 | 128 |
CALICO_CNI_TAR=calico-cni-v${CALICO_CNI_VER_REL}.tar
|
| 129 | 129 |
CALICO_K8S_POLICY_TAR=calico-k8s-policy-v${CALICO_K8S_POLICY_VER_REL}.tar
|
| ... | ... |
@@ -21,7 +21,7 @@ then |
| 21 | 21 |
exit 1 |
| 22 | 22 |
fi |
| 23 | 23 |
|
| 24 |
-IMG_NAME=vmware_photon_${DIST_VER}/kubernetes-dashboard-amd64:v${K8S_DASH_VER}
|
|
| 24 |
+IMG_NAME=vmware/photon-${DIST_VER}-kubernetes-dashboard-amd64:v${K8S_DASH_VER}
|
|
| 25 | 25 |
|
| 26 | 26 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 27 | 27 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| ... | ... |
@@ -24,7 +24,7 @@ then |
| 24 | 24 |
fi |
| 25 | 25 |
|
| 26 | 26 |
for K8S_BIN in ${K8S_DNS_BINS[*]}; do
|
| 27 |
- IMG_NAME=vmware_photon_${DIST_VER}/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}
|
|
| 27 |
+ IMG_NAME=vmware/photon-${DIST_VER}-k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}
|
|
| 28 | 28 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 29 | 29 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| 30 | 30 |
echo "Removing image ${IMG_NAME}"
|
| ... | ... |
@@ -41,7 +41,7 @@ popd |
| 41 | 41 |
setup_repo |
| 42 | 42 |
|
| 43 | 43 |
for K8S_BIN in ${K8S_DNS_BINS[*]}; do
|
| 44 |
- IMG_NAME=vmware_photon_${DIST_VER}/k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}
|
|
| 44 |
+ IMG_NAME=vmware/photon-${DIST_VER}-k8s-dns-${K8S_BIN}-amd64:${K8S_DNS_VER}
|
|
| 45 | 45 |
K8S_TAR_NAME=k8s-dns-${K8S_BIN}-${K8S_DNS_VER_REL}.tar
|
| 46 | 46 |
docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .
|
| 47 | 47 |
docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
|
| ... | ... |
@@ -24,7 +24,7 @@ fi |
| 24 | 24 |
|
| 25 | 25 |
K8S_BINS=(kube-apiserver kube-controller-manager kube-proxy kube-scheduler) |
| 26 | 26 |
for K8S_BIN in ${K8S_BINS[*]}; do
|
| 27 |
- IMG_NAME=vmware_photon_${DIST_VER}/${K8S_BIN}-amd64:v${K8S_VER}
|
|
| 27 |
+ IMG_NAME=vmware/photon-${DIST_VER}-${K8S_BIN}-amd64:v${K8S_VER}
|
|
| 28 | 28 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 29 | 29 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| 30 | 30 |
echo "Removing image ${IMG_NAME}"
|
| ... | ... |
@@ -41,7 +41,7 @@ rpm2cpio ${K8S_PAUSE_RPM} | cpio -vid
|
| 41 | 41 |
popd |
| 42 | 42 |
|
| 43 | 43 |
for K8S_BIN in ${K8S_BINS[*]}; do
|
| 44 |
- IMG_NAME=vmware_photon_${DIST_VER}/${K8S_BIN}-amd64:v${K8S_VER}
|
|
| 44 |
+ IMG_NAME=vmware/photon-${DIST_VER}-${K8S_BIN}-amd64:v${K8S_VER}
|
|
| 45 | 45 |
K8S_TAR_NAME=${K8S_BIN}-v${K8S_VER_REL}.tar
|
| 46 | 46 |
docker build --rm -t ${IMG_NAME} -f ./Dockerfile.${K8S_BIN} .
|
| 47 | 47 |
docker save -o ${K8S_TAR_NAME} ${IMG_NAME}
|
| ... | ... |
@@ -53,7 +53,7 @@ done |
| 53 | 53 |
# |
| 54 | 54 |
# K8S Pause container |
| 55 | 55 |
# |
| 56 |
-PAUSE_IMG_NAME=vmware_photon_${DIST_VER}/pause-amd64:v${K8S_VER}
|
|
| 56 |
+PAUSE_IMG_NAME=vmware/photon-${DIST_VER}-pause-amd64:v${K8S_VER}
|
|
| 57 | 57 |
PAUSE_TAR_NAME=k8s-pause-v${K8S_VER_REL}.tar
|
| 58 | 58 |
|
| 59 | 59 |
PAUSE_IMG_ID=`docker images -q ${PAUSE_IMG_NAME} 2> /dev/null`
|
| ... | ... |
@@ -21,7 +21,7 @@ then |
| 21 | 21 |
exit 1 |
| 22 | 22 |
fi |
| 23 | 23 |
|
| 24 |
-IMG_NAME=vmware_photon_${DIST_VER}/k8s-heapster-amd64:${K8S_HEAPSTER_VER}
|
|
| 24 |
+IMG_NAME=vmware/photon-${DIST_VER}-k8s-heapster-amd64:${K8S_HEAPSTER_VER}
|
|
| 25 | 25 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 26 | 26 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| 27 | 27 |
echo "Removing image ${IMG_NAME}"
|
| ... | ... |
@@ -23,7 +23,7 @@ then |
| 23 | 23 |
exit 1 |
| 24 | 24 |
fi |
| 25 | 25 |
|
| 26 |
-IMG_NAME=vmware_photon_${DIST_VER}/nginx-ingress:v${NGINX_INC_VER}
|
|
| 26 |
+IMG_NAME=vmware/photon-${DIST_VER}-nginx-ingress:v${NGINX_INC_VER}
|
|
| 27 | 27 |
|
| 28 | 28 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 29 | 29 |
if [[ ! -z "${IMG_ID}" ]]; then
|
| ... | ... |
@@ -23,7 +23,7 @@ then |
| 23 | 23 |
exit 1 |
| 24 | 24 |
fi |
| 25 | 25 |
|
| 26 |
-IMG_NAME=vmware_photon_${DIST_VER}/wavefront-proxy:v${WAVEFRONT_PROXY_VER}
|
|
| 26 |
+IMG_NAME=vmware/photon-${DIST_VER}-wavefront-proxy:v${WAVEFRONT_PROXY_VER}
|
|
| 27 | 27 |
|
| 28 | 28 |
IMG_ID=`docker images -q ${IMG_NAME} 2> /dev/null`
|
| 29 | 29 |
if [[ ! -z "${IMG_ID}" ]]; then
|