Change CI scripts to use files to return values

- This allows the CI to read the output (name of docker image:tag)

Author: Karl Isenberg

.gitignore

@@ -9,4 +9,10 @@ npm-debug.log
 .DS_Store
 ./**/*.tmp
 .tmp
-.revision
+.revision
+
+# files used by CI
+.site-image
+.pdf-image
+.pdf-bundle-path
+.pdf-bundle-url

ci/pdf/0-commit-hook.sh

@@ -18,20 +18,16 @@ DCOS_CRT="${DCOS_CRT}" # ex: docs-us.crt
 
 ci/pdf/1-setup-env.sh
 
-# capture output AND print to stdout
-exec 5>&1
-function close_file_descriptor() {
-  exec 5>&-
-}
-trap 'close_file_descriptor' EXIT
-
-DOCKER_IMAGE="$(ci/pdf/2-build-pdf-image.sh | tee >(cat - >&5) | grep "^Image: " | sed "s/^Image: //")"
+ci/pdf/2-build-pdf-image.sh
+DOCKER_IMAGE="$(cat ".pdf-image")"
 export DOCKER_IMAGE # export separately so errexit works :(
 
-PDF_BUNDLE_PATH="$(ci/pdf/3-extract-pdf-bundle.sh | tee >(cat - >&5) | grep "^PDF Bundle Path: " | sed "s/^PDF Bundle Path: //")"
+ci/pdf/3-extract-pdf-bundle.sh
+PDF_BUNDLE_PATH="$(cat ".pdf-bundle-path")"
 export PDF_BUNDLE_PATH # export separately so errexit works :(
 
-PDF_BUNDLE_URL="$(ci/pdf/4-publish-pdf-bundle.sh | tee >(cat - >&5) | grep "^PDF Bundle URL: " | sed "s/^PDF Bundle URL: //")"
+ci/pdf/4-publish-pdf-bundle.sh
+PDF_BUNDLE_PATH="$(cat ".pdf-bundle-url")"
 export PDF_BUNDLE_URL # export separately so errexit works :(
 
 ci/pdf/5-deploy-site-update.sh

ci/pdf/2-build-pdf-image.sh

@@ -24,3 +24,4 @@ echo "Image Build Success!"
 
 DOCKER_IMAGE="mesosphere/dcos-docs-pdf:latest"
 echo "Image: ${DOCKER_IMAGE}"
+echo "${IMAGE_NAME}:${IMAGE_TAG}" > ".pdf-image"

ci/pdf/3-extract-pdf-bundle.sh

@@ -31,3 +31,4 @@ mv "${PDF_BUNDLE_DIR}/${PDF_BUNDLE_NAME}" "${PDF_BUNDLE_DIR}/${NEW_PDF_BUNDLE_NA
 
 echo "PDF Bundle Tag Success!"
 echo "PDF Bundle Path: ${PDF_BUNDLE_DIR}/${NEW_PDF_BUNDLE_NAME}"
+echo "${PDF_BUNDLE_DIR}/${NEW_PDF_BUNDLE_NAME}" > ".pdf-bundle-path"

ci/pdf/4-publish-pdf-bundle.sh

@@ -23,3 +23,4 @@ aws s3 cp "${PDF_BUNDLE_PATH}" "s3://downloads.mesosphere.io/dcos-docs-site/${PD
 echo "PDF Bundle Publish Success!"
 PDF_BUNDLE_URL="https://downloads.mesosphere.com/dcos-docs-site/${PDF_BUNDLE_NAME}"
 echo "PDF Bundle URL: ${PDF_BUNDLE_URL}"
+echo "${PDF_BUNDLE_URL}" > ".pdf-bundle-url"

ci/site/0-commit-hook.sh

@@ -20,17 +20,12 @@ DCOS_CRT="${DCOS_CRT}" # ex: docs-us.crt
 
 ci/site/1-setup-env.sh
 
-# capture output AND print to stdout
-exec 5>&1
-function close_file_descriptor() {
-  exec 5>&-
-}
-trap 'close_file_descriptor' EXIT
-
-IMAGE=$(ci/site/2-build-site-image.sh | tee >(cat - >&5) | grep "^Image: " | sed "s/^Image: //")
-IMAGE_NAME="$(echo "${IMAGE}" | sed 's/^\(.*\):\([^:]*\)/\1/')"
+ci/site/2-build-site-image.sh
+
+DOCKER_IMAGE="$(cat ".site-image")"
+IMAGE_NAME="$(echo "${DOCKER_IMAGE}" | sed 's/^\(.*\):\([^:]*\)/\1/')"
 export IMAGE_NAME # export separately so errexit works :(
-IMAGE_TAG="$(echo "${IMAGE}" | sed 's/^\(.*\):\([^:]*\)/\2/')"
+IMAGE_TAG="$(echo "${DOCKER_IMAGE}" | sed 's/^\(.*\):\([^:]*\)/\2/')"
 export IMAGE_TAG # export separately so errexit works :(
 
 ci/site/3-test-site-image.sh

ci/site/2-build-site-image.sh

@@ -35,3 +35,4 @@ docker tag ${IMAGE_NAME}:${TEMP_IMAGE_TAG} ${IMAGE_NAME}:${IMAGE_TAG}
 
 echo "Image Tag Success!"
 echo "Image: ${IMAGE_NAME}:${IMAGE_TAG}"
+echo "${IMAGE_NAME}:${IMAGE_TAG}" > ".site-image"