Remove dockerinit once and for all #19490

cyphar · 2016-01-20T11:59:27Z

dockerinit has been in Docker since (AFAIK) the very beginning. It was once used by the LXC driver to set up containers. LXC has long since been removed and dockerinit has no real use anymore.

This could technically be included in 1.10, but we should probably wait until after the release (although, it would be nice to remove LXC and the former LXC hack known as dockerinit in the same version).

Closes #18355

Signed-off-by: Aleksa Sarai asarai@suse.com

cyphar · 2016-01-21T06:32:38Z

All the tests pass, so after the engine-api stuff is merged, we can merge this.

hqhq · 2016-01-21T07:35:51Z

Glad to see we'll finally remove dockerinit, ping @tianon for reviewing.

tianon · 2016-01-21T17:32:39Z

hack/vendor.sh

@@ -22,7 +22,7 @@ clone git github.com/vdemeester/shakers 3c10293ce22b900c27acad7b28656196fcc2f73b
 clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://github.com/golang/net.git
 clone git github.com/docker/go-units 651fc226e7441360384da338d0fd37f2440ffbe3
 clone git github.com/docker/go-connections v0.1.2
-clone git github.com/docker/engine-api v0.2.2
+clone git github.com/docker/engine-api remove-dockerinit https://github.com/cyphar/engine-api


There's a PR open for this change, right? (On my phone now or I'd check directly)

Aha docker-archive-public/docker.engine-api#53 👍

tianon · 2016-01-21T17:36:02Z

I love it!

LK4D4 · 2016-01-21T17:46:00Z

Very cool!

cyphar · 2016-01-21T20:48:30Z

It looks like there's some outstanding issues with switching to libseccomp-dev instead of building libseccomp. I'll leave those for another PR.

tianon · 2016-01-21T20:52:57Z

Yeah, that's fair IMO. 👍

LK4D4 · 2016-01-21T20:53:51Z

Yeah, I think it's enough for this PR :) Thanks @cyphar

cyphar · 2016-01-21T21:18:27Z

@tianon @LK4D4 docker-archive-public/docker.engine-api#53 is waiting on this to move out of design review before merging.

LK4D4 · 2016-01-21T21:47:33Z

@cyphar @calavera I moved it to code-review

estesp · 2016-01-21T23:44:24Z

LGTM

thaJeztah · 2016-01-21T23:59:11Z

@cyphar (and others here) w.r.t. the vendoring; we recently moved the "vendor" check to a separate check in CI; that allows you to include the changed vendor files as part of your PR, without making the tests fail (just the "vendor" check will fail; making it more apparent that we should not merge)

thaJeztah · 2016-01-22T00:03:38Z

Is this something to be considered? #18355 (comment)

cyphar · 2016-01-22T03:10:38Z

@thaJeztah So you're saying I shouldn't update vendor.sh and just manually patch it? As for @rhatdan's comment, I'm not really sure what he means by "alternate docker binaries".

thaJeztah · 2016-01-22T03:34:18Z

@cyphar yes, I think that works; that we can review design/code changes, after that, the PR in the other repository can be merged, vendor.sh can be updated (and run) to get the "real" vendor changes in.

thaJeztah · 2016-01-22T03:35:06Z

For now, this is fine, but I think that's a workflow that may work well (we're still getting used to the new repositories, so bear with us 😄)

rhatdan · 2016-01-22T14:30:30Z

@cyphar I was talking about things like hooks.d, which we would like to be able to execute from inside of docker containers. We were looking at the location of dockerinit to figure out where to install a hook. This is not a big deal, we will just move our hooks to be installed in /usr/lib/docker/ going forward, which seems to be the new standard for distributions, of where to launch helper applications.

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

Compabitility fix for Docker >= 1.11 (moby/moby#19490)"

…check accordingly File /.dockerinit no longer exists. With Docker versions 1.11 and 1.12 there's /.dockerenv available, though it's not yet sure whether this will be present in the future too, so check for either /.dockerenv or a proper cgroup setup inside the docker container. File /proc/1/cgroup with Docker version 1.12.1 on Debian/jessie looks like: | root@4c3a1c6d773c:/# cat /proc/1/cgroup | 8:freezer:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 7:perf_event:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 6:net_cls,net_prio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 5:cpuset:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 4:blkio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 3:cpu,cpuacct:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 2:devices:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 1:name=systemd:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 See moby/moby#18355 and moby/moby#19490 for details. Change-Id: I2d649f65c8bba50193171ec7fbfd20160ddfc319

…check accordingly File /.dockerinit no longer exists. With Docker versions 1.11 and 1.12 there's /.dockerenv available, though it's not yet sure whether this will be present in the future too, so check for either /.dockerenv or a proper cgroup setup inside the docker container. File /proc/1/cgroup with Docker version 1.12.1 on Debian/jessie looks like: | root@4c3a1c6d773c:/# cat /proc/1/cgroup | 8:freezer:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 7:perf_event:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 6:net_cls,net_prio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 5:cpuset:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 4:blkio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 3:cpu,cpuacct:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 2:devices:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 1:name=systemd:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 See moby/moby#18355 and moby/moby#19490 for details. Change-Id: I79fff0eead1a11f80b461791b2285a65d706262a

Compabitility fix for Docker >= 1.11 (moby/moby#19490) * pr/1548: Compabitility fix for Docker >= 1.11 (moby/moby#19490) Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>

…check accordingly File /.dockerinit no longer exists. With Docker versions 1.11 and 1.12 there's /.dockerenv available, though it's not yet sure whether this will be present in the future too, so check for either /.dockerenv or a proper cgroup setup inside the docker container. File /proc/1/cgroup with Docker version 1.12.1 on Debian/jessie looks like: | root@4c3a1c6d773c:/# cat /proc/1/cgroup | 8:freezer:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 7:perf_event:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 6:net_cls,net_prio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 5:cpuset:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 4:blkio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 3:cpu,cpuacct:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 2:devices:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 1:name=systemd:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 See moby/moby#18355 and moby/moby#19490 for details. Change-Id: I79fff0eead1a11f80b461791b2285a65d706262a (cherry picked from commit 6d35b85)

docker removed /.dockerinit file and /.dockerenv is kind of deprecated. This change therefore checks for /.dockerenv and the cgroup See: moby/moby#18355 moby/moby#19490

…results in an early exit moby/moby#19490

…check accordingly The fix is comming from Mantis ticket 22099. File /.dockerinit no longer exists. With Docker versions 1.11 and 1.12 there's /.dockerenv available, though it's not yet sure whether this will be present in the future too, so check for either /.dockerenv or a proper cgroup setup inside the docker container. File /proc/1/cgroup with Docker version 1.12.1 on Debian/jessie looks like: | root@4c3a1c6d773c:/# cat /proc/1/cgroup | 8:freezer:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 7:perf_event:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 6:net_cls,net_prio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 5:cpuset:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 4:blkio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 3:cpu,cpuacct:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 2:devices:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 1:name=systemd:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 See moby/moby#18355 and moby/moby#19490 for details. Change-Id: I79fff0eead1a11f80b461791b2285a65d706262a (cherry picked from commit 6d35b85) (cherry picked from commit 8a9bb07)

…check accordingly The fix is comming from Mantis ticket 22099. File /.dockerinit no longer exists. With Docker versions 1.11 and 1.12 there's /.dockerenv available, though it's not yet sure whether this will be present in the future too, so check for either /.dockerenv or a proper cgroup setup inside the docker container. File /proc/1/cgroup with Docker version 1.12.1 on Debian/jessie looks like: | root@4c3a1c6d773c:/# cat /proc/1/cgroup | 8:freezer:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 7:perf_event:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 6:net_cls,net_prio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 5:cpuset:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 4:blkio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 3:cpu,cpuacct:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 2:devices:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 1:name=systemd:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 See moby/moby#18355 and moby/moby#19490 for details. Change-Id: I79fff0eead1a11f80b461791b2285a65d706262a (cherry picked from commit 6d35b85)

…check accordingly The fix is comming from Mantis ticket 22099. File /.dockerinit no longer exists. With Docker versions 1.11 and 1.12 there's /.dockerenv available, though it's not yet sure whether this will be present in the future too, so check for either /.dockerenv or a proper cgroup setup inside the docker container. File /proc/1/cgroup with Docker version 1.12.1 on Debian/jessie looks like: | root@4c3a1c6d773c:/# cat /proc/1/cgroup | 8:freezer:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 7:perf_event:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 6:net_cls,net_prio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 5:cpuset:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 4:blkio:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 3:cpu,cpuacct:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 2:devices:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 | 1:name=systemd:/docker/4c3a1c6d773c1a5675f24ff58540ff1a290489e7325e1e66ec2c3392aa3a1145 See moby/moby#18355 and moby/moby#19490 for details. Change-Id: I79fff0eead1a11f80b461791b2285a65d706262a (cherry picked from commit 6d35b85) (cherry picked from commit 8a9bb07)

GordonTheTurtle added the status/0-triage label Jan 20, 2016

cyphar mentioned this pull request Jan 20, 2016

types: remove Init{Sha1,Path} docker-archive-public/docker.engine-api#53

Merged

cyphar force-pushed the remove-dockerinit branch from 9271783 to a97502f Compare January 20, 2016 15:00

calavera added status/1-design-review and removed status/0-triage labels Jan 20, 2016

cyphar force-pushed the remove-dockerinit branch from a97502f to 8edddb8 Compare January 21, 2016 03:33

tianon reviewed Jan 21, 2016
View reviewed changes

cyphar force-pushed the remove-dockerinit branch 2 times, most recently from aee269e to ecbaecb Compare January 21, 2016 20:27

cyphar force-pushed the remove-dockerinit branch from ecbaecb to b57319f Compare January 21, 2016 20:49

LK4D4 added status/2-code-review and removed status/1-design-review labels Jan 21, 2016

cyphar force-pushed the remove-dockerinit branch from b57319f to 1843195 Compare January 23, 2016 01:53

moul added a commit to moul/os-rootfs that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

686c6f6

moul added a commit to moul/image-builder-raw that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

7d82ec2

moul added a commit to moul/image-builder-rpi that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

5a0a986

moul added a commit to moul/ship-it that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)"

cbb9d32

moul added a commit to moul/ship-it that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)"

8295566

moul added a commit to moul/gitlab-ci that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)"

4081199

moul added a commit to moul/kythe that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

2ca6c57

moul added a commit to moul/cloudstack that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

a36c656

moul added a commit to moul/cloudstack that referenced this pull request May 14, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

becdd34

StefanScherer added a commit to hypriot/image-builder-rpi that referenced this pull request May 15, 2016

Merge pull request #73 from moul/compat-docker-111

beb589b

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

DieterReuter added a commit to hypriot/image-builder-raw that referenced this pull request May 15, 2016

Merge pull request #6 from moul/compat-docker-111

9404f12

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

rail pushed a commit to mozilla-releng/ship-it-archived that referenced this pull request May 15, 2016

Merge pull request #62 from moul/patch-2

6e5d9c1

Compabitility fix for Docker >= 1.11 (moby/moby#19490)"

moul added a commit to moul/cloudstack that referenced this pull request Jun 30, 2016

Compabitility fix for Docker >= 1.11 (moby/moby#19490)

c92dcd2

ds82 mentioned this pull request Oct 27, 2016

fix: check /.dockerenv or cgroup setup sindresorhus/is-docker#3

Merged

szepeviktor mentioned this pull request Nov 15, 2016

with 1.11.1, builder.sh fails with "cannot stat ...dockerinit-1.11.1’: No such file or directory" hypriot/rpi-docker-builder#14

Open

rspeicher pushed a commit to gitlabhq/gitlabhq that referenced this pull request Dec 9, 2016

Update php.md - /.dockerinit was removed in v1.11 so the test always …

48d8991

…results in an early exit moby/moby#19490

tianon mentioned this pull request Mar 22, 2023

Prefer loading docker-init from an appropriate "libexec" directory #45198

Merged

Remove dockerinit once and for all #19490

Remove dockerinit once and for all #19490

Uh oh!

Conversation

cyphar commented Jan 20, 2016

Uh oh!

cyphar commented Jan 21, 2016

Uh oh!

hqhq commented Jan 21, 2016

Uh oh!

tianon Jan 21, 2016

Choose a reason for hiding this comment

Uh oh!

tianon Jan 21, 2016

Choose a reason for hiding this comment

Uh oh!

tianon commented Jan 21, 2016

Uh oh!

LK4D4 commented Jan 21, 2016

Uh oh!

cyphar commented Jan 21, 2016

Uh oh!

tianon commented Jan 21, 2016 via email

Uh oh!

LK4D4 commented Jan 21, 2016

Uh oh!

cyphar commented Jan 21, 2016

Uh oh!

LK4D4 commented Jan 21, 2016

Uh oh!

estesp commented Jan 21, 2016

Uh oh!

thaJeztah commented Jan 21, 2016

Uh oh!

thaJeztah commented Jan 22, 2016

Uh oh!

cyphar commented Jan 22, 2016

Uh oh!

thaJeztah commented Jan 22, 2016

Uh oh!

thaJeztah commented Jan 22, 2016

Uh oh!

rhatdan commented Jan 22, 2016

Uh oh!

Uh oh!