configure docker-init binary path #26941
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@thaJeztah @vdemeester why only documentation started in CI 😕 |
|
@runcom 😞 GitHub API rate limit perhaps? Can you try a rebuild through IRC? |
| @@ -93,6 +94,7 @@ func (config *Config) InstallFlags(flags *pflag.FlagSet) { | |||
| flags.StringVar(&config.DefaultRuntime, "default-runtime", stockRuntimeName, "Default OCI runtime for containers") | |||
| flags.IntVar(&config.OOMScoreAdjust, "oom-score-adjust", -500, "Set the oom_score_adj for the daemon") | |||
| flags.BoolVar(&config.Init, "init", false, "Run an init in the container to forward signals and reap processes") | |||
| flags.StringVar(&config.InitPath, "init-path", "", "Path to the init binary") | |||
There was a problem hiding this comment.
Probably clearer to say "path to the docker-init" binary
| @@ -49,6 +49,7 @@ Options: | |||
| --help Print usage | |||
| --icc=true Enable inter-container communication | |||
| --init Run an init inside containers to forward signals and reap processes | |||
| --init-path Path to init binary | |||
| @@ -170,6 +171,9 @@ unix://[/path/to/socket] to use. | |||
| **--init** | |||
| Run an init process inside containers for signal forwarding and process reaping. | |||
|
|
|||
| **--init-path** | |||
| Path to the init binary. | |||
| @@ -246,6 +247,7 @@ func AddFlags(flags *pflag.FlagSet) *ContainerOptions { | |||
| flags.StringVar(&copts.runtime, "runtime", "", "Runtime to use for this container") | |||
|
|
|||
| flags.BoolVar(&copts.init, "init", false, "Run an init inside the container that forwards signals and reaps processes") | |||
| flags.StringVar(&copts.initPath, "init-path", "", "Custom init path") | |||
There was a problem hiding this comment.
And use the same wording here
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
runcom
force-pushed
the
docker-init-path-1
branch
from
f26a63a to
6a12685
Compare
|
@justincormack fixed |
|
LGTM |
|
LGTM, moving to docs. |
|
LGTM |
|
LGTM ping @albers @sdurrheimer for the completion scripts 🐢 |
|
@thaJeztah will do, thanks for the ping. |
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Jan 16, 2017
Pull request moby#27745 added support for the client to talk to older versions of the daemon. Various flags were added to docker 1.13 that are not compatible with older daemons. This PR adds annotations to those flags, so that they are automatically hidden if the daemon is older than docker 1.13 (API 1.25). Not all new flags affect the API (some are client-side only). The following PR's added new flags to docker 1.13 that affect the API; - moby#23430 added `--cpu-rt-period`and `--cpu-rt-runtime` - moby#27800 / moby#25317 added `--group` / `--group-add` / `--group-rm` - moby#27702 added `--network` to `docker build` - moby#25962 added `--attachable` to `docker network create` - moby#27998 added `--compose-file` to `docker stack deploy` - moby#22566 added `--stop-timeout` to `docker run` and `docker create` - moby#26061 added `--init` to `docker run` and `docker create` - moby#26941 added `--init-path` to `docker run` and `docker create` - moby#27958 added `--cpus` on `docker run` / `docker create` - moby#27567 added `--dns`, `--dns-opt`, and `--dns-search` to `docker service create` - moby#27596 added `--force` to `docker service update` - moby#27857 added `--hostname` to `docker service create` - moby#28031 added `--hosts`, `--host-add` / `--host-rm` to `docker service create` and `docker service update` - moby#28076 added `--tty` on `docker service create` / `docker service update` - moby#26421 added `--update-max-failure-ratio`, `--update-monitor` and `--rollback` on `docker service update` - moby#27369 added `--health-cmd`, `--health-interval`, `--health-retries`, `--health-timeout` and `--no-healthcheck` options to `docker service create` and `docker service update` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
andrewhsu
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
May 19, 2017
Pull request moby/moby#27745 added support for the client to talk to older versions of the daemon. Various flags were added to docker 1.13 that are not compatible with older daemons. This PR adds annotations to those flags, so that they are automatically hidden if the daemon is older than docker 1.13 (API 1.25). Not all new flags affect the API (some are client-side only). The following PR's added new flags to docker 1.13 that affect the API; - moby/moby#23430 added `--cpu-rt-period`and `--cpu-rt-runtime` - moby/moby#27800 / moby/moby#25317 added `--group` / `--group-add` / `--group-rm` - moby/moby#27702 added `--network` to `docker build` - moby/moby#25962 added `--attachable` to `docker network create` - moby/moby#27998 added `--compose-file` to `docker stack deploy` - moby/moby#22566 added `--stop-timeout` to `docker run` and `docker create` - moby/moby#26061 added `--init` to `docker run` and `docker create` - moby/moby#26941 added `--init-path` to `docker run` and `docker create` - moby/moby#27958 added `--cpus` on `docker run` / `docker create` - moby/moby#27567 added `--dns`, `--dns-opt`, and `--dns-search` to `docker service create` - moby/moby#27596 added `--force` to `docker service update` - moby/moby#27857 added `--hostname` to `docker service create` - moby/moby#28031 added `--hosts`, `--host-add` / `--host-rm` to `docker service create` and `docker service update` - moby/moby#28076 added `--tty` on `docker service create` / `docker service update` - moby/moby#26421 added `--update-max-failure-ratio`, `--update-monitor` and `--rollback` on `docker service update` - moby/moby#27369 added `--health-cmd`, `--health-interval`, `--health-retries`, `--health-timeout` and `--no-healthcheck` options to `docker service create` and `docker service update` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 5d2722f83db9e301c6dcbe1c562c2051a52905db Component: cli
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following the discussion on https://github.com/docker/docker/pull/26061/files#r80361337
I've added a new contianer and daemon flag
--init-pathwhich configures thedocker-initpath./cc @justincormack @crosbymichael
Signed-off-by: Antonio Murdaca runcom@redhat.com