Merge pull request #113 from AdRoll/host-build-arg

Added hologram host arg to allow pre-configured internal-use installers

Dockerfile

@@ -14,7 +14,8 @@ RUN apt-get update && apt-get install -y \
                                 rsyslog \
                                 ruby \
                                 zlib1g-dev \
-                                ruby-dev
+                                ruby-dev \
+                                jq
 
 RUN gem install fpm
 

buildscripts/build_osx_pkgs.sh

@@ -23,6 +23,12 @@ install -m 0644 ${HOLOGRAM_DIR}/agent/support/darwin/com.adroll.hologram-me.plis
 install -m 0755 ${HOLOGRAM_DIR}/agent/support/darwin/postinstall.sh /hologram-build/darwin/scripts/postinstall
 install -m 0755 ${HOLOGRAM_DIR}/agent/support/darwin/preinstall.sh /hologram-build/darwin/scripts/preinstall
 
+# Special handling for custom host override
+if [[ -n "$HOLOGRAM_HOST" ]]
+then
+  cat "${HOLOGRAM_DIR}/config/agent.json" | jq ". + {\"host\": \"$HOLOGRAM_HOST\"}" > /hologram-build/darwin/root/etc/hologram/agent.json
+fi
+
 NUM_FILES=$(find /hologram-build/darwin/root | wc -l)
 INSTALL_KB_SIZE=$(du -k -s /hologram-build/darwin/root | awk '{print $1}')
 

buildscripts/compile_hologram.sh

@@ -7,7 +7,7 @@ source ${HOLOGRAM_DIR}/buildscripts/returncodes.sh
 export GIT_TAG=$(git describe --tags --long)
 
 echo "Compiling for linux..."
-GOOS=linux  go install -ldflags="-X 'main.Version=${GIT_TAG}'" github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}
+GOOS=linux go install -ldflags="-X 'main.Version=${GIT_TAG}'" github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}
 
 echo "Compiling for osx"
 GOOS=darwin go install -ldflags="-X 'main.Version=${GIT_TAG}'" github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}

buildscripts/start.sh

@@ -4,6 +4,8 @@ source ${HOLOGRAM_DIR}/buildscripts/returncodes.sh
 
 rsyslogd  # Believe it or not you need syslog to test hologram
 
+export HOLOGRAM_HOST="$2"
+
 if [ "$1" == "build_linux" ]; then
     compile_hologram.sh --deps || exit $?
     build_linux_pkgs.sh || exit $?

hologram.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-#docker build -t adroll/hologram_env .
-docker run --rm -t -i -v $(pwd):/go/src/github.com/AdRoll/hologram adroll/hologram_env $1
+docker build -t adroll/hologram_env .
+docker run --rm -t -i -v $(pwd):/go/src/github.com/AdRoll/hologram adroll/hologram_env $1 $2