Commit Graph

30 Commits

Author SHA1 Message Date
6be47e4a6c Add some docs about build-arg's impact on the cache
Closes #18017

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ec3aa7ede2
Component: cli
2017-06-02 00:07:18 +00:00
6d7ca0ef19 Fixes found by docs validation tool
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: d63c19c4ea
Component: cli
2017-06-02 00:07:18 +00:00
5f568c0605 Support multi-dir wildcards in .dockerignore
Closes #13113

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 4978171903
Component: cli
2017-06-02 00:07:17 +00:00
8050e305f6 First pass at consolidating
Removing old networking.md
Updating dockernetworks.md with images
Adding information on network plugins
Adding blurb about links to docker networking
Updating the working documentation
Adding Overlay Getting Started
Downplaying links by removing refs/examples, adding refs/examples for network.
Updating getting started to reflect networks not links
Pulling out old network material
Updating per discussion with Madhu to add Default docs section
Updating with bridge default
Fix bad merge
Updating with new cluster-advertise behavior
Update working and NetworkSettings examples
Correcting example for default bridge discovery behavior
Entering comments
Fixing broken Markdown Syntax
Updating with comments
Updating all the links

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 02a859b9f3
Component: cli
2017-06-02 00:07:15 +00:00
e16c15092c Add ability to add multiple tags with docker build
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 9d9976ae3a
Component: cli
2017-06-02 00:07:14 +00:00
9e47fd5a5a Update ambassador image, use the socat -t option
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: edbb82c900
Component: cli
2017-06-02 00:07:14 +00:00
900900b4d7 updating docs for EXPOSE option on run command; fixes #16634
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: d83594a46d
Component: cli
2017-06-02 00:07:12 +00:00
d4f3c46baf Enabled GitHub Flavored Markdown
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e641a0f363
Component: cli
2017-06-02 00:07:12 +00:00
690359813b clarify dockerignore semantics
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
Upstream-commit: 42fe72228d
Component: cli
2017-06-02 00:07:11 +00:00
0e98ff8444 Mention more realistic examples are available
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: d86cfdfb84
Component: cli
2017-06-02 00:07:11 +00:00
49281f044b Don't put dockerfiles in one continuous code block
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 090ad2bb8a
Component: cli
2017-06-02 00:07:11 +00:00
ddf084d760 Touch up "Dockerfile reference"
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 0039e46e3e
Component: cli
2017-06-02 00:07:10 +00:00
6a2b5a7a84 Add documentation note that LABEL allows environment replacement
Signed-off-by: Tim Waugh <twaugh@redhat.com>
Upstream-commit: a8db81a89a
Component: cli
2017-06-02 00:07:10 +00:00
0a7b038a58 incorporate doc review comments
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 9fab23902f
Component: cli
2017-06-02 00:07:09 +00:00
a49195f1d6 Support for passing build-time variables in build context
- The build-time variables are passed as environment-context for command(s)
run as part of the RUN primitve. These variables are not persisted in environment of
intermediate and final images when passed as context for RUN. The build environment
is prepended to the intermediate continer's command string for aiding cache lookups.
It also helps with build traceability. But this also makes the feature less secure from
point of view of passing build time secrets.

- The build-time variables also get used to expand the symbols used in certain
Dockerfile primitves like ADD, COPY, USER etc, without an explicit prior definiton using a
ENV primitive. These variables get persisted in the intermediate and final images
whenever they are expanded.

- The build-time variables are only expanded or passed to the RUN primtive if they
are defined in Dockerfile using the ARG primitive or belong to list of built-in variables.
HTTP_PROXY, HTTPS_PROXY, http_proxy, https_proxy, FTP_PROXY and NO_PROXY are built-in
variables that needn't be explicitly defined in Dockerfile to use this feature.

Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 40a2dac738
Component: cli
2017-06-02 00:07:09 +00:00
6a0da0245a update documentation styling as per suggestions
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 8ff51d3827
Component: cli
2017-06-02 00:07:09 +00:00
3fef8fffb2 add a documentation note on backslash usage in shell form of RUN
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 0ece7ed9d4
Component: cli
2017-06-02 00:07:09 +00:00
016d3c3aa6 Add STOPSIGNAL instruction to dockerfiles.
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f5b80326a1
Component: cli
2017-06-02 00:07:08 +00:00
83978ae0df add missing instruction
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 08481e81ca
Component: cli
2017-06-02 00:07:06 +00:00
374c800384 remove references to 'source repository'
- rewrite intro to Dockerfile reference usage section to remove
   references to 'source repository'
- Closes #14714
- Fixes:  #8648
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e0d42a679c
Component: cli
2017-06-02 00:07:06 +00:00
73a2904d6e Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 58a37fe8cf
Component: cli
2017-06-02 00:07:06 +00:00
519334c5f4 add documentation clarifying behavior of VOLUME instruction
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: d3dae7f652
Component: cli
2017-06-02 00:07:05 +00:00
5a08821360 Fixing docs to remove references to links under terms/
Removed terms/ directory

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Upstream-commit: 56632110e0
Component: cli
2017-06-02 00:07:05 +00:00
ebdbcae978 Remove note from docker version 1.3 on Env variables
Fixes #14734

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 66516a7ec3
Component: cli
2017-06-02 00:07:05 +00:00
0cf3c17dc2 Minor edits to Environment variables section
* Clarify the list of supported instructions.
* Clarify behavior of ONBUILD, based on comments by @SvenDowideit, @theJeztah in PR #14735.
* Reorder list of instructions in alphabetical order.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 8a1164778d
Component: cli
2017-06-02 00:07:03 +00:00
711f0d0ac6 Fix typo
Signed-off-by: John Tims <john.k.tims@gmail.com>
Upstream-commit: ec19c839c6
Component: cli
2017-06-02 00:07:03 +00:00
63142db1f7 Fix typo in builder.mb .dockerignore example
Signed-off-by: jgeiger <jgeiger@gmail.com>
Upstream-commit: 21ba115188
Component: cli
2017-06-02 00:07:02 +00:00
114a1b5710 Clarify .dockerignore example for Markdown files
The current documentation correctly states that dockerignore pattern
searches are non-recursive. However, the example given for Markdown
files seems to contradict this by saying that `*.md` will exclude *all*
Markdown files. This commit clarifies the situation by explicitly
specifying that `*.md` will only exclude files in the root directory of
the project.

Signed-off-by: Tim Wraight <tim.wraight@tangentlabs.co.uk>
Upstream-commit: 85ff60eb74
Component: cli
2017-06-02 00:07:00 +00:00
f73c587d92 Fix a broken anchor tag on the CLI builder page
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com>
Upstream-commit: c4541d3793
Component: cli
2017-06-02 00:07:00 +00:00
18a7041c64 retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d1d033701e
Component: cli
2017-06-02 00:06:58 +00:00