updated docs system

docs-1.x
Torkel Ödegaard 10 years ago
parent 5f5bb8541b
commit 1f550be949
  1. 2
      docs/Dockerfile
  2. 6
      docs/Makefile

@ -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

@ -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)" .

Loading…
Cancel
Save