@@ -434,7 +434,8 @@ k8s-docker-images: start-docker photon-docker-image

 	./build-flannel-docker-image.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

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

 	./build-k8s-heapster-image.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE) && \

-	./build-k8s-nginx-ingress.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE)

+	./build-k8s-nginx-ingress.sh $(PHOTON_DIST_TAG) $(PHOTON_RELEASE_VERSION) $(PHOTON_SPECS_DIR) $(PHOTON_STAGE)  && \

+	./build-wavefront-proxy-docker-image.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 .

@@ -1,7 +1,7 @@

 Summary:        lightweight java application to send metrics to.

 Name:           wavefront-proxy

 Version:        4.16

-Release:        3%{?dist}

+Release:        4%{?dist}

 License:        Apache 2.0

 URL:            https://github.com/wavefrontHQ/java

 Source0:        https://github.com/wavefrontHQ/java/archive/wavefront-%{version}.tar.gz 

@@ -44,6 +44,7 @@ Restart=on-failure

 WantedBy=multi-user.target

 EOF

 sed -i 's/\/etc\/init.d\/$APP_BASE-proxy restart/ systemctl restart $APP_BASE-proxy/' pkg/opt/wavefront/wavefront-proxy/bin/autoconf-wavefront-proxy.sh

+sed -i 's/-jar \/opt\/wavefront\/wavefront-proxy\/bin\/wavefront-push-agent.jar/-jar \/opt\/wavefront-push-agent.jar/' proxy/docker/run.sh

 %build

 mvn install

@@ -57,6 +58,7 @@ install -m 755 -D pkg/etc/wavefront/wavefront-proxy/wavefront.conf.default %{bui

 install -m 755 -D pkg/usr/share/doc/wavefront-proxy/copyright %{buildroot}/%{_docdir}/%name/copyright

 install -m 755 -D proxy/target/proxy-%{version}-uber.jar %{buildroot}/opt/wavefront-push-agent.jar

 install -m 755 -D wavefront-proxy.service %{buildroot}/%{_unitdir}/wavefront-proxy.service

+install -m 755 -D proxy/docker/run.sh %{buildroot}/opt/wavefront/%{name}/bin/run.sh

 %pre

 user="wavefront"

@@ -104,6 +106,8 @@ rm -rf %{buildroot}/*

 %{_unitdir}/wavefront-proxy.service

 %changelog

+* Mon Oct 08 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-4

+- Add Docker related files to the package

 * Tue Oct 03 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-3

 - Fix for CVE-2017-9735

 * Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 4.16-2

new file mode 100644

@@ -0,0 +1,36 @@

+FROM vmware/photon

+

+# This script may automatically configure wavefront without prompting, based on

+# these variables:

+#  WAVEFRONT_URL           (required)

+#  WAVEFRONT_TOKEN         (required)

+#  JAVA_HEAP_USAGE         (default is 4G)

+#  WAVEFRONT_HOSTNAME      (default is the docker containers hostname)

+#  WAVEFRONT_USE_GRAPHITE  (default is false)

+

+

+RUN tdnf install -y net-tools sed openjre shadow

+# Copy files

+COPY [ "./tmp/wavefront-proxy/etc/wavefront/wavefront-proxy/log4j2-stdout.xml", \

+       "./tmp/wavefront-proxy/etc/wavefront/wavefront-proxy/log4j2.xml", \

+       "./tmp/wavefront-proxy/etc/wavefront/wavefront-proxy/preprocessor_rules.yaml",\

+       "./tmp/wavefront-proxy/etc/wavefront/wavefront-proxy/wavefront.conf", \

+       "/etc/wavefront/wavefront-proxy/" ]

+

+COPY ./tmp/wavefront-proxy/lib/systemd/system/wavefront-proxy.service /lib/systemd/system/ 

+COPY ./tmp/wavefront-proxy/opt/wavefront-push-agent.jar /opt/

+COPY ./tmp/wavefront-proxy/opt/wavefront/wavefront-proxy/bin/autoconf-wavefront-proxy.sh /opt/wavefront/wavefront-proxy/bin/

+COPY ./tmp/wavefront-proxy/opt/wavefront/wavefront-proxy/bin/run.sh /

+

+# Configure agent

+ENV DO_SERVICE_RESTART=false

+RUN echo '\nephemeral=true' >> /etc/wavefront/wavefront-proxy/wavefront.conf

+RUN echo '\nflushThreads=6' >> /etc/wavefront/wavefront-proxy/wavefront.conf

+

+# Run the agent

+EXPOSE 3878

+EXPOSE 2878

+EXPOSE 4242

+ENV PATH=/opt/wavefront/wavefront-proxy/jre/bin:$PATH

+ENV WAVEFRONT_USE_GRAPHITE=false

+ENTRYPOINT ["/bin/bash", "/run.sh"]

new file mode 100755

@@ -0,0 +1,42 @@

+#!/bin/bash -e

+

+DIST_TAG=$1

+DIST_VER=$2

+SPEC_DIR=$3

+STAGE_DIR=$4

+ARCH=noarch

+

+#

+# Docker image for wavefront-proxy

+#

+WAVEFRONT_PROXY_VER=`cat ${SPEC_DIR}/wavefront-proxy/wavefront-proxy.spec | grep Version | cut -d: -f2 | tr -d ' '`

+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

+

+if [ ! -f ${WAVEFRONT_PROXY_RPM_FILE} ]

+then

+    echo "wavefront-proxy RPM ${WAVEFRONT_PROXY_RPM_FILE} not found. Exiting.."

+    exit 1

+fi

+

+IMG_NAME=vmware_photon_${DIST_VER}/wavefront-proxy:v${WAVEFRONT_PROXY_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/wavefront-proxy

+cp ${WAVEFRONT_PROXY_RPM_FILE} tmp/wavefront-proxy/

+pushd ./tmp/wavefront-proxy

+rpm2cpio ${WAVEFRONT_PROXY_RPM} | cpio -vid

+popd

+docker build --rm -t ${IMG_NAME} -f Dockerfile.wavefront-proxy .

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

+gzip ${WAVEFRONT_PROXY_TAR}

+mv -f ${WAVEFRONT_PROXY_TAR}.gz ${STAGE_DIR}/

+

+rm -rf ./tmp