зеркало из https://github.com/microsoft/docker.git
make docs is more consistent
This commit is contained in:
Родитель
0025e9bd71
Коммит
27646c4459
4
Makefile
4
Makefile
|
@ -1,4 +1,4 @@
|
||||||
.PHONY: all binary build default doc shell test
|
.PHONY: all binary build default docs shell test
|
||||||
|
|
||||||
DOCKER_RUN_DOCKER := docker run -rm -i -t -privileged -e TESTFLAGS -v $(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles docker
|
DOCKER_RUN_DOCKER := docker run -rm -i -t -privileged -e TESTFLAGS -v $(CURDIR)/bundles:/go/src/github.com/dotcloud/docker/bundles docker
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ all: build
|
||||||
binary: build
|
binary: build
|
||||||
$(DOCKER_RUN_DOCKER) hack/make.sh binary
|
$(DOCKER_RUN_DOCKER) hack/make.sh binary
|
||||||
|
|
||||||
doc:
|
docs:
|
||||||
docker build -t docker-docs docs && docker run -p 8000:8000 docker-docs
|
docker build -t docker-docs docs && docker run -p 8000:8000 docker-docs
|
||||||
|
|
||||||
test: build
|
test: build
|
||||||
|
|
|
@ -57,7 +57,7 @@ docs inside the container, even starting a simple HTTP server on port
|
||||||
8000 so that you can connect and see your changes.
|
8000 so that you can connect and see your changes.
|
||||||
|
|
||||||
In the ``docker`` source directory, run:
|
In the ``docker`` source directory, run:
|
||||||
```make doc```
|
```make docs```
|
||||||
|
|
||||||
This is the equivalent to ``make clean server`` since each container starts clean.
|
This is the equivalent to ``make clean server`` since each container starts clean.
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ to it, you can build the documentation and then serve it by:
|
||||||
|
|
||||||
.. code-block:: bash
|
.. code-block:: bash
|
||||||
|
|
||||||
sudo make doc
|
sudo make docs
|
||||||
# when its done, you can point your browser to http://yourdockerhost:8000
|
# when its done, you can point your browser to http://yourdockerhost:8000
|
||||||
# type Ctrl-C to exit
|
# type Ctrl-C to exit
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче