kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity
moby--moby/docs/Dockerfile

114 lines
5.3 KiB
Text
Raw Normal View History

add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
2013-10-28 20:39:44 -04:00
#
update go import path and libcontainer Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-24 18:19:50 -04:00
# See the top level Makefile in https://github.com/docker/docker for usage.
add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
2013-10-28 20:39:44 -04:00
#
Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-16 23:05:38 -05:00
FROM docs/base:latest
Cleanup docs Dockerfile, so it matches best practices. Docker-DCO-1.1-Signed-off-by: Joseph Ferguson <joe@infosiftr.com> (github: yosifkit)
2014-10-22 18:14:02 -04:00
MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit)
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
# This section ensures we pull the correct version of each
# sub project
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
ENV COMPOSE_BRANCH release
for 1.6 Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-16 14:33:49 -04:00
ENV SWARM_BRANCH v0.2.0
ENV MACHINE_BRANCH master
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
ENV DISTRIB_BRANCH release/2.0
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# TODO: need the full repo source to get the git version info
COPY . /src
# Reset the /docs dir so we can replace the theme meta with the new repo's git info
Updating with man pages for distribution Went through the man pages to update for the v2 instance. Checked against the commands. Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-01 15:20:59 -04:00
# RUN git reset --hard
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# Then copy the desired docs into the /docs/sources/ dir
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-24 19:37:36 -05:00
COPY ./sources/ /docs/sources
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
COPY ./VERSION VERSION
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-24 19:37:36 -05:00
# 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
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# TODO: don't do this - look at merging the yml file in build.sh
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
COPY ./mkdocs.yml ./s3_website.json ./release.sh ./
Updating with man pages for distribution Went through the man pages to update for the v2 instance. Checked against the commands. Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-01 15:20:59 -04:00
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Updating with man pages for distribution Went through the man pages to update for the v2 instance. Checked against the commands. Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-01 15:20:59 -04:00
# Docker Distribution
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
########################
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
#ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/mkdocs.yml /docs/mkdocs-distribution.yml
Updating with man pages for distribution Went through the man pages to update for the v2 instance. Checked against the commands. Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-01 15:20:59 -04:00
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/images/notifications.png \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/images/registry.png \
/docs/sources/registry/images/
In with the old menu layout Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-15 22:02:01 -04:00
Docker Registry Server > Docker Registry Fixing registry index Tested on beta and this redirect works Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-18 20:42:24 -04:00
ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/index.md \
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/deploying.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/configuration.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storagedrivers.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/notifications.md \
/docs/sources/registry/
In with the old menu layout Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-15 22:02:01 -04:00
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/spec/api.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/spec/json.md \
/docs/sources/registry/spec/
Fixing a few links in registry Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-21 21:36:37 -04:00
ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/s3.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/azure.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/filesystem.md \
https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/storage-drivers/inmemory.md \
/docs/sources/registry/storage-drivers/
In with the old menu layout Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-15 22:02:01 -04:00
ADD https://raw.githubusercontent.com/docker/distribution/${DISTRIB_BRANCH}/docs/spec/auth/token.md /docs/sources/registry/spec/auth/token.md
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
RUN sed -i.old '1s;^;no_version_dropdown: true;' \
/docs/sources/registry/*.md \
/docs/sources/registry/spec/*.md \
/docs/sources/registry/spec/auth/*.md
Updating with man pages for distribution Went through the man pages to update for the v2 instance. Checked against the commands. Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-01 15:20:59 -04:00
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# Docker Swarm
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
#ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/docs/mkdocs.yml /docs/mkdocs-swarm.yml
ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/docs/index.md /docs/sources/swarm/index.md
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/discovery/README.md /docs/sources/swarm/discovery.md
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/api/README.md /docs/sources/swarm/API.md
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/scheduler/filter/README.md /docs/sources/swarm/scheduler/filter.md
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
ADD https://raw.githubusercontent.com/docker/swarm/${SWARM_BRANCH}/scheduler/strategy/README.md /docs/sources/swarm/scheduler/strategy.md
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/swarm/*.md /docs/sources/swarm/scheduler/*.md
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# Docker Machine
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
#ADD https://raw.githubusercontent.com/docker/machine/${MACHINE_BRANCH}/docs/mkdocs.yml /docs/mkdocs-machine.yml
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
ADD https://raw.githubusercontent.com/docker/machine/${MACHINE_BRANCH}/docs/index.md /docs/sources/machine/index.md
set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-25 07:46:55 -05:00
RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/machine/index.md
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# Docker Compose
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
#######################
Adding environment variables for sub projects Fixes issue #12186 Fixing variables per Jess Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-08 12:55:58 -04:00
#ADD https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/mkdocs.yml /docs/mkdocs-compose.yml
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
ADD https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/index.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/install.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/cli.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/yml.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/env.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/completion.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/django.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/rails.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/wordpress.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/extends.md \
https://raw.githubusercontent.com/docker/compose/${COMPOSE_BRANCH}/docs/production.md \
/docs/sources/compose/
RUN sed -i.old '1s;^;no_version_dropdown: true;' /docs/sources/compose/*.md
Updates to Compose docs and ENV vars - Compose teamhad forgotten some documentation - Updated ENV for Distribution also - Forgot one of the readability sections Signed-off-by: Mary Anthony <mary@docker.com>
2015-04-17 15:53:30 -04:00
Import docs from swarm, machine and compose repositories, Also add the image spec from the code area to show we're building from the repo-root now Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-17 23:20:46 -05:00
# Then build everything together, ready for mkdocs
docs: speed up build by reducing build steps - should be also easier to maintain Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
2015-04-18 06:59:20 -04:00
RUN /docs/build.sh
Copy permalink