Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configure docker-init binary path #26941

Merged
merged 1 commit into from Sep 28, 2016

Conversation

@runcom
Copy link
Member

commented Sep 27, 2016

Following the discussion on https://github.com/docker/docker/pull/26061/files#r80361337

I've added a new contianer and daemon flag --init-path which configures the docker-init path.

/cc @justincormack @crosbymichael

Signed-off-by: Antonio Murdaca runcom@redhat.com

@runcom

This comment has been minimized.

Copy link
Member Author

commented Sep 27, 2016

@thaJeztah @vdemeester why only documentation started in CI 😕

@thaJeztah

This comment has been minimized.

Copy link
Member

commented Sep 27, 2016

@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")

This comment has been minimized.

Copy link
@justincormack

justincormack Sep 27, 2016

Contributor

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

This comment has been minimized.

Copy link
@justincormack

justincormack Sep 27, 2016

Contributor

and here

@@ -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.

This comment has been minimized.

Copy link
@justincormack

justincormack Sep 27, 2016

Contributor

and here

@@ -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")

This comment has been minimized.

Copy link
@justincormack

justincormack Sep 27, 2016

Contributor

And use the same wording here

configure docker-init binary path
Signed-off-by: Antonio Murdaca <runcom@redhat.com>

@runcom runcom force-pushed the runcom:docker-init-path-1 branch from f26a63a to 6a12685 Sep 27, 2016

@runcom

This comment has been minimized.

Copy link
Member Author

commented Sep 27, 2016

@LK4D4

This comment has been minimized.

Copy link
Contributor

commented Sep 27, 2016

LGTM

@cpuguy83

This comment has been minimized.

Copy link
Contributor

commented Sep 27, 2016

LGTM, moving to docs.

@vdemeester
Copy link
Member

left a comment

LGTM 🐸
/cc @thaJeztah

@runcom runcom added this to the 1.13.0 milestone Sep 27, 2016

@justincormack

This comment has been minimized.

Copy link
Contributor

commented Sep 28, 2016

LGTM

@thaJeztah

This comment has been minimized.

Copy link
Member

commented Sep 28, 2016

LGTM

ping @albers @sdurrheimer for the completion scripts 🐢

@thaJeztah thaJeztah merged commit 9f05939 into moby:master Sep 28, 2016

5 checks passed

docker/dco-signed All commits signed
Details
documentation success
Details
experimental Jenkins build Docker-PRs-experimental 24364 has succeeded
Details
janky Jenkins build Docker-PRs 32956 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 3788 has succeeded
Details

@runcom runcom deleted the runcom:docker-init-path-1 branch Sep 28, 2016

@albers

This comment has been minimized.

Copy link
Member

commented Sep 28, 2016

@thaJeztah will do, thanks for the ping.

thaJeztah added a commit to thaJeztah/docker that referenced this pull request Jan 16, 2017
Add version annotation to various flags added in 1.13
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/docker-ce that referenced this pull request May 19, 2017
Add version annotation to various flags added in 1.13
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
srust added a commit to srust/moby that referenced this pull request Nov 30, 2017
Add version annotation to various flags added in 1.13
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can’t perform that action at this time.