浏览代码

Support for new Ghost version 1.0 (#3254)

* Update ghost-basics/run.sh

* Get version directly from ghost
sharkoz 8 年之前
父节点
当前提交
03dfb79d96
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      test/tests/ghost-basics/run.sh

+ 7 - 2
test/tests/ghost-basics/run.sh

@@ -16,7 +16,7 @@ _request() {
 	local method="$1"
 	shift
 
-	local url="${1#/}"
+	local url="${1}"
 	shift
 
 	docker run --rm --link "$cid":ghost "$clientImage" \
@@ -27,4 +27,9 @@ _request() {
 . "$dir/../../retry.sh" '_request GET / --output /dev/null'
 
 # Check that /ghost/ redirects to setup (the image is unconfigured by default)
-_request GET '/ghost/' -I | grep -q '^Location: .*setup'
+ghostVersion="$(docker inspect --format '{{range .Config.Env}}{{ . }}{{"\n"}}{{end}}' "$serverImage" | awk -F= '$1 == "GHOST_VERSION" { print $2 }')"
+case "$ghostVersion" in
+	0.*) _request GET '/ghost/' -I | grep -q '^Location: .*setup' ;;
+	*)   _request GET '/ghost/api/v0.1/authentication/setup/' | grep -q 'status":false' ;;
+esac
+