From 0f2247b7aba44e5aaa39f7789d90b59fc58aee9a Mon Sep 17 00:00:00 2001 From: Chris Baker Date: Tue, 9 Oct 2018 15:28:46 -0400 Subject: [PATCH] website testing: minor formatting changes, passing in middleman version from outer Makefile --- website/Makefile | 2 +- website/scripts/test.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/website/Makefile b/website/Makefile index 2dfa53ed1..e92e090a0 100644 --- a/website/Makefile +++ b/website/Makefile @@ -24,6 +24,6 @@ website: test: @echo "==> Running website tests..." - ./scripts/test.sh + ./scripts/test.sh ${VERSION} .PHONY: build website diff --git a/website/scripts/test.sh b/website/scripts/test.sh index c24fc6582..aef25bfc0 100755 --- a/website/scripts/test.sh +++ b/website/scripts/test.sh @@ -1,9 +1,10 @@ #!/bin/bash set -e +# passed in from outer makefile, default to 0.3.35 MMVERSION=${1-0.3.35} -echo Running website in container... +echo "Running website in container..." WEBSITE_CID=$(docker run \ --detach \ --rm \ @@ -11,9 +12,9 @@ WEBSITE_CID=$(docker run \ --publish "35729:35729" \ --volume "$PWD:/website" \ hashicorp/middleman-hashicorp:${MMVERSION}) -echo Website running in container ${WEBSITE_CID}. +echo "Website running in container ${WEBSITE_CID}." trap 'echo Killing docker website container... && docker kill ${WEBSITE_CID}' EXIT HUP INT QUIT TERM -echo Checking website for dead links using recursive wget... +echo "Checking website for dead links using recursive wget..." wget -nv --recursive --level=10 --delete-after http://localhost:4567