From 1f550be949c3b4b2fc36851f4aad38b591bc4c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 11 Mar 2015 10:46:48 +0100 Subject: [PATCH] updated docs system --- docs/Dockerfile | 2 ++ docs/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index 6be96a8039d..765ca86dbb7 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -11,6 +11,8 @@ COPY ./sources/ /docs/sources COPY ./VERSION /docs/VERSION +COPY ./changed-files /docs/changed-files + # adding the image spec will require Docker 1.5 and `docker build -f docs/Dockerfile .` #COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md diff --git a/docs/Makefile b/docs/Makefile index b2698402e6e..fcb1708f916 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -44,7 +44,7 @@ docs-test: docs-build $(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh docs-build: - git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > /changed-files - echo "$(GIT_BRANCH)" > docs/GIT_BRANCH - echo "$(GITCOMMIT)" > docs/GITCOMMIT + git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > changed-files + echo "$(GIT_BRANCH)" > GIT_BRANCH + echo "$(GITCOMMIT)" > GITCOMMIT docker build -t "$(DOCKER_DOCS_IMAGE)" .