Commit 1f550be9 by Torkel Ödegaard

updated docs system

parent 5f5bb854
...@@ -11,6 +11,8 @@ COPY ./sources/ /docs/sources ...@@ -11,6 +11,8 @@ COPY ./sources/ /docs/sources
COPY ./VERSION /docs/VERSION 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 .` # 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 #COPY ./image/spec/v1.md /docs/sources/reference/image-spec-v1.md
......
...@@ -44,7 +44,7 @@ docs-test: docs-build ...@@ -44,7 +44,7 @@ docs-test: docs-build
$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh $(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" ./test.sh
docs-build: docs-build:
git fetch https://github.com/grafana/grafana.git docs-1.x && git diff --name-status FETCH_HEAD...HEAD -- . > /changed-files 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 "$(GIT_BRANCH)" > GIT_BRANCH
echo "$(GITCOMMIT)" > docs/GITCOMMIT echo "$(GITCOMMIT)" > GITCOMMIT
docker build -t "$(DOCKER_DOCS_IMAGE)" . docker build -t "$(DOCKER_DOCS_IMAGE)" .
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment