IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Build: changing docs docker image to prevent setting up frontend devenv. (#28670)

Browse Source 
* Build: changing docs dev-environment

I have added a new image that will include the auto-generated frontend docs so you don't have to generate those locally prior to running the doc container. This has a dependency on this PR: https://github.com/grafana/website/pull/2744 and that we publish a version of the `grafana/docs-devenv` image.

* will ignore everything (even symbolic links)

* fixed spelling.

* added newline.

* updated image name.
This commit is contained in:
Marcus Andersson 2020-10-30 10:22:01 +01:00 committed by GitHub
parent 43a0167b01
commit e8bfb21851
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -119,5 +119,5 @@ compilation-stats.json
# report dumping the whole system env
/report.*.json
# auto generated front end docs
/docs/sources/packages_api/*
# auto generated frontend docs
/docs/sources/packages_api

25
docs/Makefile
View File

@ -1,23 +1,14 @@
.PHONY: docs docs-test docs-no-pull docs-generate-frontend docs-no-generate-frontend
.PHONY: docs docs-no-pull docs-test
IMAGE = grafana/docs-base:latest
IMAGE = grafana/grafana-docs-dev:latest
docs-generate-frontend:
yarn install --pure-lockfile
yarn run packages:build
yarn run packages:docsExtract
yarn run packages:docsToMarkdown
yarn run packages:clean
docs-no-generate-frontend:
docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE) /bin/bash -c 'make server'
docs: docs-generate-frontend
docs:
docker pull $(IMAGE)
docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE) /bin/bash -c 'make server'
docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE)
docs-no-pull:
docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest -p 3002:3002 --rm -it $(IMAGE)
docs-no-pull: docs-generate-frontend docs-no-generate-frontend
docs-test: docs-generate-frontend
docs-test:
docker pull $(IMAGE)
docker run -v $(shell pwd)/sources:/hugo/content/docs/grafana/latest --rm -it $(IMAGE) /bin/bash -c 'make prod'