summaryrefslogtreecommitdiff
path: root/hack/dind
Commit message (Collapse)AuthorAgeFilesLines
* Add integration test for #38995, #43390Cory Snider2022-10-261-0/+4
| | | | | | | | | Modify the DinD entrypoint scripts to make the issue reproducible inside a DinD container. Co-authored-by: Bjorn Neergaard <bneergaard@mirantis.com> Signed-off-by: Bjorn Neergaard <bneergaard@mirantis.com> Signed-off-by: Cory Snider <csnider@mirantis.com>
* hack/dind: fix cgroup v2 evacuation with `docker run --init`Akihiro Suda2021-04-281-2/+3
| | | | | | | | | | | | | | | | | | | | Evacuate all the processes in `/sys/fs/cgroup/cgroup.procs`, not just PID 1. Before: ```console $ docker run --rm --privileged --init $(docker build -q .) cat /sys/fs/cgroup/cgroup.subtree_control sed: couldn't flush stdout: Device or resource busy ``` After: ```console $ docker run --rm --privileged --init $(docker build -q .) cat /sys/fs/cgroup/cgroup.subtree_control cpuset cpu io memory hugetlb pids rdma ``` Fix docker-library/docker issue 308 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* test-integration: support cgroup2Akihiro Suda2020-06-221-0/+11
| | | | | | | | | | Usage: DOCKER_BUILD_ARGS="--build-arg CONTAINERD_COMMIT=master --build-arg RUNC_COMMIT=master" DOCKER_EXPERIMENTAL=1 TEST_SKIP_INTEGRATION_CLI=1 make test-integration Depends on containerd master (v1.4) and runc master (v1.0.0-rc91). Currently `TEST_SKIP_INTEGRATION_CLI=1` must be specified. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* Shell scripts: fix bare variablesSebastiaan van Stijn2019-01-101-1/+1
| | | | | | This makes my IDE a bit more silent :-) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Revert "Bash scripts; use double brackets, fix bare variables, add quotes"Sebastiaan van Stijn2019-01-101-2/+2
| | | | | | This reverts commit 297b30df5ff4deaaedb6ceb17d7bd2e306a580ab. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Bash scripts; use double brackets, fix bare variables, add quotesSebastiaan van Stijn2018-12-241-2/+2
| | | | | | | | | | | These scripts explicitly use Bash, so we should be able to use `[[` instead of `[` (which seems to be recommended). Also added curly brackets to some bare variables, and quoted some paths. This makes my IDE a bit more silent :-) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"Tianon Gravi2017-02-131-1/+1
| | | | | | This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
* Update dindsrinsriv2016-05-241-1/+1
| | | | | | Typo Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
* Remove cgroups mounting in dindAlexander Morozov2015-11-161-78/+0
| | | | Signed-off-by: Alexander Morozov <lk4d4@docker.com>
* Remove LXC support.David Calavera2015-11-051-7/+0
| | | | | | | | The LXC driver was deprecated in Docker 1.8. Following the deprecation rules, we can remove a deprecated feature after two major releases. LXC won't be supported anymore starting on Docker 1.10. Signed-off-by: David Calavera <david.calavera@gmail.com>
* Missing a single dash in error messageSven Dowideit2015-10-111-1/+1
| | | | Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
* Update dind "/tmp" mounting to be optionalTianon Gravi2015-08-211-2/+4
| | | | | | This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
* update hack/dind for 1.8 mounting of cgroupsJessica Frazelle2015-08-211-67/+71
| | | | Signed-off-by: Jessica Frazelle <acidburn@docker.com>
* hack: quote all parameters with variable interpolationJörg Thalheim2015-04-151-1/+1
| | | | | | better safe then sorry. especially for rm Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
* HTTPS urls for ./hackingEric Windisch2015-04-111-1/+1
| | | | Signed-off-by: Eric Windisch <eric@windisch.us>
* docker-tests: mount hierarchies and make symlinks for subsystemsPavel Tikhomirov2015-03-311-14/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker does not know about our named cpuacct,cpu,cpuset cgroup hierarchy with multiple subsystems in it. So to use them with docker in integration-cli test TestRunWithCpuset inside docker container we need to add symlinks to them in hack/dind script. Example: old version of parser will do: cat /proc/1/cgroup 11:cpu,cpuacct,name=my_cpu_cpuacct:/ ... and create and mount this hierarchy to directory /cgroup/cpu,cpuacct,name=my_cpu_cpuacct/ so docker cannot find it because it has strange name in new parser directory will be same as on host /cgroup/my_cpu_cpuacct and have symlinks for docker to find it /cgroup/cpu -> /cgroup/my_cpu_cpuacct /cgroup/cpuacct -> /cgroup/my_cpu_cpuacct in other case if where is no name cat /proc/1/cgroup 11:cpu,cpuacct:/ ... mount will be same for both parsers /cgroup/cpu,cpuacct and new one will also create symlinks /cgroup/cpu -> /cgroup/cpu,cpuacct /cgroup/cpuacct -> /cgroup/cpu,cpuacct Signed-off-by: Pavel Tikhomirov <ptikhomirov@parallels.com>
* Move scripts back to hack/, leave docs in project/Tianon Gravi2015-03-131-0/+88
| | | | | | This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead. Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
* Move 'hack' to the less confusing 'project'Solomon Hykes2014-11-091-88/+0
| | | | | | | We might want to break it up into smaller pieces (eg. tools in one place, documents in another) but let's worry about that later. Signed-off-by: Solomon Hykes <solomon@docker.com>
* update go import path and libcontainerVictor Vieux2014-07-241-1/+1
| | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
* I'm going to wish I didn't do thisSvenDowideit2014-07-031-1/+1
| | | | Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
* Merge pull request #5463 from tianon/hack-dind-cgroupJérôme Petazzoni2014-05-091-1/+1
|\ | | | | Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" for better compatibility
| * Update hack/dind to mount cgroups on "/cgroup" instead of "/sys/fs/cgroup" ↵Tianon Gravi2014-04-281-1/+1
| | | | | | | | | | | | | | | | for better compatibility Fixes #5122 Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* | Merge pull request #5462 from tianon/hack-dind-styleJérôme Petazzoni2014-05-021-26/+34
|\ \ | | | | | | Update hack/dind to match the rest of our scripts
| * | Update hack/dind to match the rest of our scriptsTianon Gravi2014-04-281-26/+34
| |/ | | | | | | | | | | No functional changes here, just coding style and maintainability. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* | skip apparmor with dindVictor Vieux2014-05-011-0/+3
| | | | | | | | Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
* | Close extraneous file descriptors in containersTianon Gravi2014-04-291-16/+0
|/ | | | | | | | Without this patch, containers inherit the open file descriptors of the daemon, so my "exec 42>&2" allows us to "echo >&42 some nasty error with some bad advice" directly into the daemon log. :) Also, "hack/dind" was already doing this due to issues caused by the inheritance, so I'm removing that hack too since this patch obsoletes it by generalizing it for all containers. Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Update to double-dash everywhereTianon Gravi2014-03-131-2/+2
| | | | | | These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there). Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
* Refactor HostConfig and escape apparmor confinementJérôme Petazzoni2013-11-011-0/+8
|
* Remove spurious messages, and use proper args expansion.Jérôme Petazzoni2013-10-171-3/+4
| | | | Also, display some (hopefully helpful) message when no command was given.
* Work around an exotic bug affecting Docker-in-Docker + systemd.Jérôme Petazzoni2013-10-171-0/+25
|
* Adapt Dockerfile to run docker tests inside dockerSolomon Hykes2013-09-061-0/+3
|
* Adapt the original dind script and add a descriptionSolomon Hykes2013-09-061-10/+10
|
* Copy dind wrapper script from github.com/jpetazzo/dindSolomon Hykes2013-09-061-0/+56
View Lorry Controller Status