mirror of
https://github.com/grafana/grafana.git
synced 2024-11-26 02:40:26 -06:00
96008c9738
commit 4113ed00782590187d19dd2f8cbae683f164142c
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Fri Oct 21 10:47:35 2016 +0200
docs(): minor fix for docs index page
commit 45478d120571519462fac905aadeab5954696690
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Thu Oct 20 14:28:21 2016 +0200
updated
commit c9c1c1d5a462f85e8001a45218f24102583d7aee
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Thu Oct 20 14:27:34 2016 +0200
docs(): updated image refs
commit 5fa0f27963968d77bbbbb7edd973847ea72135e3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Wed Oct 19 14:33:04 2016 +0200
docs is almost done
commit 6b988c90cb08563e2c27212338c2947e69f6fcc3
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Tue Oct 18 20:45:28 2016 +0200
almost done
commit 17757c21ed813892ddb1f289f2e52613caf7bcef
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Tue Oct 18 16:45:48 2016 +0200
making progress on docs
commit f06c815991dd81b8893912a6da04a17b80b63fda
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Tue Oct 18 14:30:55 2016 +0200
progress on new docs
commit 5197237426252623de2d8b9cc22ddbbdbb240763
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Tue Oct 18 13:25:26 2016 +0200
making progress
commit 33e2b6b617f16f65878141cf11e54b2817a2ea96
Merge: de385e5 ecb4a99
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Tue Oct 18 12:17:58 2016 +0200
Merge branch 'new-docs' of github.com:grafana/grafana into new-docs
commit ecb4a99dd54aa39f17d9bf4d7e132a389812f8fd
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Tue Oct 18 10:39:59 2016 +0200
keep urls for now
commit de385e56d86b071cf2150ccf9f1aa06ec5187277
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Mon Oct 17 17:56:18 2016 +0200
more progress
commit 8469ebc239ab2316cbbc01862e5026737f272f00
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Mon Oct 17 17:08:06 2016 +0200
progress on new docs
commit e755f656b12534cfcb23bad11f1fa696e43f7428
Merge: 4644a35 35cce3b
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Mon Oct 17 12:21:27 2016 +0200
Merge branch 'new-docs' of github.com:grafana/grafana into new-docs
commit 4644a35102555204787e91041b50dcbfe0f7a213
Merge: 25c4bef 977cdd5
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Mon Oct 17 12:21:11 2016 +0200
Merge branch 'master' of github.com:grafana/grafana into new-docs
commit 35cce3bef802fac020a53693b02c112a91a096fc
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Mon Oct 17 09:31:17 2016 +0200
progress on #6170
commit 25c4bef629de7d77218ba95cc3bd25fb50bb19d6
Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
Date: Sun Oct 16 15:05:30 2016 +0200
fix for osx
commit 6c6b52f975630be87da23dd51beafaecb820cec2
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Sun Oct 16 12:56:39 2016 +0200
progress on new docs
commit 6a09633981ab26191d5542dbe3a788846ac6b73d
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Sat Oct 15 11:39:49 2016 +0200
progress on new docs
commit 7d533fbc23e41b86fd1ba9c955dd17ae1ad977e5
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Mon Oct 10 09:25:12 2016 +0200
making progress on new docs site
commit 50392ce98edfa201977716e92e4a86f9d48ae386
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Sun Oct 9 20:02:28 2016 +0200
feat(new docs): progress on new docs site
commit 81a3d3d0952d3a5d790412e90d01ac5a247e0686
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Fri Oct 7 07:52:11 2016 +0200
new docs site experiment
commit 704adc98664665b3624087ab38ce29fc9da005f1
Author: Torkel Ödegaard <torkel@grafana.org>
Date: Sat Oct 1 20:46:53 2016 +0200
new docs poc
51 lines
2.3 KiB
Makefile
51 lines
2.3 KiB
Makefile
.PHONY: all default docs docs-build docs-shell shell test
|
|
# to allow `make DOCSDIR=1 docs-shell` (to create a bind mount in docs)
|
|
DOCS_MOUNT := $(if $(DOCSDIR),-v $(CURDIR):/docs/content/grafana/)
|
|
|
|
# to allow `make DOCSPORT=9000 docs`
|
|
DOCSPORT := 3004
|
|
|
|
# Get the IP ADDRESS
|
|
DOCKER_IP=$(shell python -c "import urlparse ; print urlparse.urlparse('$(DOCKER_HOST)').hostname or ''")
|
|
HUGO_BASE_URL=$(shell test -z "$(DOCKER_IP)" && echo localhost || echo "$(DOCKER_IP)")
|
|
HUGO_BIND_IP=0.0.0.0
|
|
|
|
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
|
|
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
|
|
DOCKER_DOCS_IMAGE := grafana/grafana-docs
|
|
|
|
DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
|
|
SOURCES_HOST_DIR := "$(shell pwd)/sources"
|
|
|
|
# for some docs workarounds (see below in "docs-build" target)
|
|
GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
|
|
|
|
default: docs
|
|
|
|
docs: docs-build
|
|
$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt && grunt connect --port=3004"
|
|
|
|
docs-watch: docs-build
|
|
$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -v $(SOURCES_HOST_DIR):/site/content -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs"
|
|
|
|
docs-watch-mac: docs-build
|
|
$(DOCKER_RUN_DOCS) -p 3004:3004 -p 3005:3005 -v $(SOURCES_HOST_DIR):/site/content -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "grunt --env=dev-docs-mac && grunt connect --port=3004 & grunt watch --port=3004 --env=dev-docs-mac"
|
|
|
|
publish: docs-build
|
|
$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh staging-docs v3.1"
|
|
|
|
publish-prod: docs-build
|
|
$(DOCKER_RUN_DOCS) "$(DOCKER_DOCS_IMAGE)" /bin/bash -c "./publish.sh prod-docs root"
|
|
|
|
docs-draft: docs-build
|
|
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 -e DOCKERHOST "$(DOCKER_DOCS_IMAGE)" hugo server --buildDrafts="true" --port=$(DOCSPORT) --baseUrl=$(HUGO_BASE_URL) --bind=$(HUGO_BIND_IP)
|
|
|
|
docs-shell: docs-build
|
|
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
|
|
|
|
test: docs-build
|
|
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)"
|
|
|
|
docs-build:
|
|
docker build -t "$(DOCKER_DOCS_IMAGE)" .
|