@@ -1,4 +1,4 @@

-FROM vmware/photon:2.0

+FROM k8s-base-image:2.0

 MAINTAINER kaushikk@vmware.com

@@ -1,4 +1,4 @@

-FROM vmware/photon:2.0

+FROM k8s-base-image:2.0

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

 # these variables:

@@ -8,8 +8,8 @@ FROM vmware/photon:2.0

 #  WAVEFRONT_HOSTNAME      (default is the docker containers hostname)

 #  WAVEFRONT_USE_GRAPHITE  (default is false)

-

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

+COPY [ "./stage-rpms-tdnf.conf", "./tmp/stage-rpms.repo", "/tmp/tdnf/" ]

+RUN tdnf tdnf -c /tmp/tdnf/stage-rpms-tdnf.conf install -y net-tools sed openjre8 shadow --refresh

 # Copy files

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

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

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

 #!/bin/bash -e

+source common.inc

+

 DIST_TAG=$1

 DIST_VER=$2

 SPEC_DIR=$3

@@ -34,6 +36,9 @@ cp ${WAVEFRONT_PROXY_RPM_FILE} tmp/wavefront-proxy/

 pushd ./tmp/wavefront-proxy

 rpm2cpio ${WAVEFRONT_PROXY_RPM} | cpio -vid

 popd

+

+setup_repo

+

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

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

 gzip ${WAVEFRONT_PROXY_TAR}