@@ -64,7 +64,7 @@ clean-install clean-chroot build-updated-packages generate-yaml-files

 THREADS?=1

-all: iso minimal-iso docker-image ostree-host-iso live-iso cloud-image-all src-iso

+all: iso minimal-iso photon-docker-image k8s-docker-images ostree-host-iso live-iso cloud-image-all src-iso

 micro: micro-iso

 	@:

@@ -385,7 +385,7 @@ generate-dep-lists:

 		--input-type=json --file $$f -d json -a $(PHOTON_DATA_DIR); \

 	done

-docker-image:

+photon-docker-image:

 	sudo docker build --no-cache --tag photon-build ./support/dockerfiles/photon

 	sudo docker run \

 		-it \

@@ -398,7 +398,13 @@ docker-image:

 		photon-build \

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

-install-docker-image: docker-image

+k8s-docker-images:

+	systemctl start docker && \

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

+	./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)

+

+install-photon-docker-image: photon-docker-image

 	sudo docker build -t photon:tdnf .

 ostree-repo: $(PHOTON_PACKAGES)

new file mode 100644

@@ -0,0 +1,14 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+RUN tdnf install -y dnsmasq

+RUN echo "user=root" > /etc/dnsmasq.conf

+RUN mkdir -p /var/run/

+STOPSIGNAL SIGCONT

+

+RUN mkdir -p /etc/k8s/dns/dnsmasq-nanny

+ADD tmp/k8dns/usr/bin/dnsmasq-nanny /dnsmasq-nanny

+ENTRYPOINT ["/dnsmasq-nanny"]

new file mode 100644

@@ -0,0 +1,8 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+ADD tmp/k8dns/usr/bin/kube-dns /kube-dns

+ENTRYPOINT ["/kube-dns"]

new file mode 100644

@@ -0,0 +1,10 @@

+# Photon Base Build Container

+

+FROM vmware/photon:1.0

+

+MAINTAINER kulkarniv@vmware.com

+

+ADD tmp/k8dns/usr/bin/sidecar /sidecar

+

+USER nobody:nobody

+ENTRYPOINT ["/sidecar"]

new file mode 100755

@@ -0,0 +1,45 @@

+#!/bin/bash -e

+

+DIST_TAG=$1

+DIST_VER=$2

+SPEC_DIR=$3

+STAGE_DIR=$4

+ARCH=x86_64

+

+#

+# Docker images for kubernetes-dashboard

+#

+K8S_DASH_VER=`cat ${SPEC_DIR}/kubernetes-dashboard/kubernetes-dashboard.spec | grep Version | cut -d: -f2 | tr -d ' '`

+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=k8s-dashboard.tar

+

+if [ ! -f ${K8S_DASH_RPM_FILE} ]

+then

+    echo "Kubernetes Dashboard RPM ${K8S_DASH_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

+IMG_NAME=vmware/k8s-dashboard-${DIST_VER}:v${K8S_DASH_VER}

+

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

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

+    echo "Removing image ${IMG_NAME}"

+    docker rmi -f ${IMG_NAME}

+fi

+

+mkdir -p tmp/k8dash

+cp ${K8S_DASH_RPM_FILE} tmp/k8dash/

+pushd ./tmp/k8dash

+rpm2cpio ${K8S_DASH_RPM} | cpio -vid

+mkdir -p img

+cp -p usr/bin/dashboard img/

+cp -p -r opt/k8dashboard/* img/

+cd img

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

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

+mv -f ${K8S_DASH_TAR} ${STAGE_DIR}/

+popd

+

+rm -rf ./tmp

new file mode 100755

@@ -0,0 +1,47 @@

+#!/bin/bash -e

+

+DIST_TAG=$1

+DIST_VER=$2

+SPEC_DIR=$3

+STAGE_DIR=$4

+ARCH=x86_64

+

+#

+# Docker images for kubernetes-dns artifacts

+#

+K8S_DNS_VER=`cat ${SPEC_DIR}/kubernetes-dns/kubernetes-dns.spec | grep Version | cut -d: -f2 | tr -d ' '`

+K8S_DNS_VER_REL=${K8S_DNS_VER}-`cat ${SPEC_DIR}/kubernetes-dns/kubernetes-dns.spec | grep Release | cut -d: -f2 | tr -d ' ' | cut -d% -f1`

+K8S_DNS_RPM=kubernetes-dns-${K8S_DNS_VER_REL}${DIST_TAG}.${ARCH}.rpm

+K8S_DNS_RPM_FILE=${STAGE_DIR}/RPMS/x86_64/${K8S_DNS_RPM}

+K8S_DNS_BINS=(dnsmasq-nanny kube-dns sidecar)

+

+if [ ! -f ${K8S_DNS_RPM_FILE} ]

+then

+    echo "Kubernetes DNS RPM ${K8S_DNS_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

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

+    IMG_NAME=vmware/k8s-dns-${K8S_BIN}-${DIST_VER}:v${K8S_DNS_VER}

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

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

+        echo "Removing image ${IMG_NAME}"

+        docker rmi -f ${IMG_NAME}

+    fi

+done

+

+mkdir -p tmp/k8dns

+cp ${K8S_DNS_RPM_FILE} tmp/k8dns/

+pushd ./tmp/k8dns

+rpm2cpio ${K8S_DNS_RPM} | cpio -vid

+popd

+

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

+    IMG_NAME=vmware/k8s-dns-${K8S_BIN}-${DIST_VER}:v${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}

+    mv -f ${K8S_TAR_NAME} ${STAGE_DIR}/

+done

+

+rm -rf ./tmp