Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] backport docs and completion fixes#519

Merged
andrewhsu merged 9 commits into
docker-archive:18.03from
thaJeztah:18.03-backport-docs-fixes
Apr 18, 2018
Merged

[18.03] backport docs and completion fixes#519
andrewhsu merged 9 commits into
docker-archive:18.03from
thaJeztah:18.03-backport-docs-fixes

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

docs and completion cherry-picks for 18.03 of:

git checkout -b 18.03-backport-docs-fixes upstream/18.03
git cherry-pick -s -S -x -Xsubtree=components/cli e9ce688d6e6d990794b51fac5ed2fed619c89f4f
git cherry-pick -s -S -x -Xsubtree=components/cli 8ca237054f13c585ce5880c2c193d106ac22c9cd
git cherry-pick -s -S -x -Xsubtree=components/cli ad44e2d45e35d09890473e20f6b2ad16de98d72a
git cherry-pick -s -S -x -Xsubtree=components/cli 5238f3e93e6141b3615e7c8b38adae5ea2175385
git cherry-pick -s -S -x -Xsubtree=components/cli 2f7bf40e733e337dadc998ae99d93fe5da5e4a16
git cherry-pick -s -S -x -Xsubtree=components/cli 5fd9eab3d0cec4d1fb3d03cd9eb4c250cf2bd23a
git cherry-pick -s -S -x -Xsubtree=components/cli 82c23208eeba822473d444221399a7102479a702
git cherry-pick -s -S -x -Xsubtree=components/cli 79c489d812524ae5a0ff26c44fa4bb2e309810bb
git cherry-pick -s -S -x -Xsubtree=components/cli 43024e2d57d7bdd63c358ac65bc3c6d1e6a4d702
git push -u origin 18.03-backport-docs-fixes

no conflicts

thaJeztah and others added 9 commits April 18, 2018 10:17
`--rm` moved to the daemon, so is now also supported
when combined with `-d`.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e9ce688d6e6d990794b51fac5ed2fed619c89f4f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This clarifies that the behaviour of `unless-stopped` will restart the container on daemon start.  This was implied before, but now the restart-on-daemon-start behaviour is mentioned directly.

Signed-off-by: David Beitey <david@davidjb.com>
(cherry picked from commit 8ca237054f13c585ce5880c2c193d106ac22c9cd)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Explicitly stated that you must add --build-arg for each build argument.
Added multiple arguments to example of `--build-arg` usage.
Fix for docker/docs#6248

Signed-off-by: Preston Cowley <cowlinator@gmail.com>
(cherry picked from commit ad44e2d45e35d09890473e20f6b2ad16de98d72a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Update the docs so that users don't use `echo` when creating
secrets from STDIN. `echo` adds a trailing new line, so users
will probably be confused when their passwords don't work.

Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
(cherry picked from commit 5238f3e93e6141b3615e7c8b38adae5ea2175385)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2f7bf40e733e337dadc998ae99d93fe5da5e4a16)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
(cherry picked from commit 5fd9eab3d0cec4d1fb3d03cd9eb4c250cf2bd23a)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This use case is currently _working correctly_, which is nice, but there is no documentation to be found about it. This PR fixes that.

Signed-off-by: Per Lundberg <perlun@gmail.com>
(cherry picked from commit 82c23208eeba822473d444221399a7102479a702)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Remove the double "docker docker" from example

Signed-off-by: Henry Ne <henrynmail-github@yahoo.de>
(cherry picked from commit 79c489d812524ae5a0ff26c44fa4bb2e309810bb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 43024e2d57d7bdd63c358ac65bc3c6d1e6a4d702)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.03.1 milestone Apr 18, 2018
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @anusha-ragunathan @vdemeester @andrewhsu PTAL

Copy link
Copy Markdown
Contributor

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐸

@thaJeztah
Copy link
Copy Markdown
Member Author

No need to restart CI, as these aren't tested, but listing failures to keep track of flakiness:

PowerPC https://jenkins.dockerproject.org/job/docker-ce-pr-ppc64le/558/execution/node/467/log/

18:32:22 FAIL: check_test.go:365: DockerSwarmSuite.TearDownTest
18:32:22 
18:32:22 unmount of /tmp/docker-execroot/dab0d9ff5d2a1/netns failed: invalid argument
18:32:22 unmount of /tmp/docker-execroot/dab0d9ff5d2a1/netns failed: no such file or directory
18:32:22 check_test.go:370:
18:32:22     d.Stop(c)
18:32:22 daemon/daemon.go:389:
18:32:22     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
18:32:22 ... Error: Error while stopping the daemon dd1a0d5297782 : exit status 130
18:32:22 
18:32:22 
18:32:22 ----------------------------------------------------------------------
18:32:22 PANIC: docker_cli_swarm_test.go:1147: DockerSwarmSuite.TestSwarmLockUnlockCluster
18:32:22 
18:32:22 [dab0d9ff5d2a1] waiting for daemon to start
18:32:22 [dab0d9ff5d2a1] daemon started
18:32:22 
18:32:22 [dd1a0d5297782] waiting for daemon to start
18:32:22 [dd1a0d5297782] daemon started
18:32:22 
18:32:22 [d4ed073cd21e4] waiting for daemon to start
18:32:22 [d4ed073cd21e4] daemon started
18:32:22 
18:32:22 [dd1a0d5297782] exiting daemon
18:32:22 [dd1a0d5297782] waiting for daemon to start
18:32:22 [dd1a0d5297782] daemon started
18:32:22 
18:32:22 [dd1a0d5297782] exiting daemon
18:32:22 [dab0d9ff5d2a1] exiting daemon
18:32:22 [dab0d9ff5d2a1] waiting for daemon to start
18:32:22 [dab0d9ff5d2a1] daemon started
18:32:22 
18:32:22 [d4ed073cd21e4] exiting daemon
18:32:22 [d4ed073cd21e4] waiting for daemon to start
18:32:22 [d4ed073cd21e4] daemon started
18:32:22 
18:32:22 [dd1a0d5297782] waiting for daemon to start
18:32:22 [dd1a0d5297782] daemon started
18:32:22 
18:32:22 [dd1a0d5297782] exiting daemon
18:32:22 [dd1a0d5297782] waiting for daemon to start
18:32:22 [dd1a0d5297782] daemon started
18:32:22 
18:32:22 [dab0d9ff5d2a1] exiting daemon
18:32:22 [dab0d9ff5d2a1] waiting for daemon to start
18:32:22 [dab0d9ff5d2a1] daemon started
18:32:22 
18:32:22 [d4ed073cd21e4] exiting daemon
18:32:22 [d4ed073cd21e4] waiting for daemon to start
18:32:22 [d4ed073cd21e4] daemon started
18:32:22 
18:32:22 [dd1a0d5297782] exiting daemon
18:32:22 [dd1a0d5297782] waiting for daemon to start
18:32:22 [dd1a0d5297782] daemon started
18:32:22 
18:32:22 [da06bc043e790] waiting for daemon to start
18:32:22 [da06bc043e790] daemon started
18:32:22 
18:32:22 [da06bc043e790] exiting daemon
18:32:22 [da06bc043e790] waiting for daemon to start
18:32:22 [da06bc043e790] daemon started
18:32:22 
18:32:22 [dab0d9ff5d2a1] exiting daemon
18:32:22 [dd1a0d5297782] daemon started
18:32:22 Attempt #2: daemon is still running with pid 9572
18:32:22 Attempt #3: daemon is still running with pid 9572
18:32:22 Attempt #4: daemon is still running with pid 9572
18:32:22 [dd1a0d5297782] exiting daemon
18:32:22 ... Panic: Fixture has panicked (see related PANIC)
18:32:22 

s390x https://jenkins.dockerproject.org/job/docker-ce-pr-s390x/567/execution/node/366/log/

18:55:44 ----------------------------------------------------------------------
18:55:44 FAIL: check_test.go:365: DockerSwarmSuite.TearDownTest
18:55:44 
18:55:44 check_test.go:370:
18:55:44     d.Stop(c)
18:55:44 daemon/daemon.go:389:
18:55:44     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
18:55:44 ... Error: Error while stopping the daemon d05b06fa3aa62 : exit status 130
18:55:44 
18:55:44 
18:55:44 ----------------------------------------------------------------------
18:55:44 PANIC: docker_api_swarm_test.go:350: DockerSwarmSuite.TestAPISwarmRaftQuorum
18:55:44 
18:55:44 [d05b06fa3aa62] waiting for daemon to start
18:55:44 [d05b06fa3aa62] daemon started
18:55:44 
18:55:44 [d799374e8bbd2] waiting for daemon to start
18:55:44 [d799374e8bbd2] daemon started
18:55:44 
18:55:44 [da553b9162415] waiting for daemon to start
18:55:44 [da553b9162415] daemon started
18:55:44 
18:55:44 [d799374e8bbd2] exiting daemon
18:55:44 [da553b9162415] exiting daemon
18:55:44 [d799374e8bbd2] waiting for daemon to start
18:55:44 [d799374e8bbd2] daemon started
18:55:44 
18:55:44 [d05b06fa3aa62] daemon started
18:55:44 Attempt #2: daemon is still running with pid 28428
18:55:44 Attempt #3: daemon is still running with pid 28428
18:55:44 Attempt #4: daemon is still running with pid 28428
18:55:44 [d05b06fa3aa62] exiting daemon
18:55:44 ... Panic: Fixture has panicked (see related PANIC)
18:55:44 

@andrewhsu andrewhsu merged commit 029cfa0 into docker-archive:18.03 Apr 18, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-docs-fixes branch April 18, 2018 22:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants