1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/hack/make
Kir Kolyshkin 228bc35e82 make test-integration: use correct dockerd binary
Here's what happens:
1. One runs `make binary` once
2. Days go by...
3. One makes changes to dockerd sources
4. One runs `make test-integration` to test the changes
5. One spends a long time figuring out why on Earth
   those changes in step 3 are ignored by step 4.
6. One writes this patch
7. ...
8. PROFIT!!

OK, so `make test-integration` builds a dockerd binary
in bundles/dynbinary-daemon/, when starts a daemon instance
for testing. The problem is, the script that starts the
daemon sets PATH to try `bundles/binary-daemon/` first,
and `bundles/dynbinary-daemon/` second.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2019-02-18 22:20:49 -08:00
..
.resources-windows
.binary Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
.binary-setup hack: restore bundling vpnkit on amd64 2019-02-05 18:21:30 -08:00
.detect-daemon-osarch Revert "Bash scripts; use double brackets, fix bare variables, add quotes" 2019-01-10 02:23:38 +01:00
.ensure-emptyfs Revert "Bash scripts; use double brackets, fix bare variables, add quotes" 2019-01-10 02:23:38 +01:00
.go-autogen Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
.go-autogen.ps1 PowerShell: remove aliases, use their real commands instead 2018-12-22 21:34:39 +01:00
.integration-daemon-setup Revert "Bash scripts; use double brackets, fix bare variables, add quotes" 2019-01-10 02:23:38 +01:00
.integration-daemon-start make test-integration: use correct dockerd binary 2019-02-18 22:20:49 -08:00
.integration-daemon-stop Revert "Bash scripts; use double brackets, fix bare variables, add quotes" 2019-01-10 02:23:38 +01:00
.integration-test-helpers Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
binary Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope 2017-05-05 12:14:29 -07:00
binary-daemon hack: restore bundling vpnkit on amd64 2019-02-05 18:21:30 -08:00
build-integration-test-binary Fix .go-autogen warnings 2017-11-01 12:03:32 +01:00
containerutility Add ADD/COPY --chown flag support to Windows 2018-08-13 21:59:11 -07:00
cross Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
cross-platform-dependent Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
dynbinary Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope 2017-05-05 12:14:29 -07:00
dynbinary-daemon Add osusergo build tar for static binaries 2018-07-19 12:25:46 +03:00
install-binary hack: restore bundling vpnkit on amd64 2019-02-05 18:21:30 -08:00
README.md Remove test-unit from hack/make 2017-07-17 11:39:33 -04:00
run Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
test-docker-py Revert "Bash scripts; use double brackets, fix bare variables, add quotes" 2019-01-10 02:23:38 +01:00
test-integration Shell scripts: fix bare variables 2019-01-10 02:50:47 +01:00
test-integration-cli Fixed typo DEREPCATED -> DEPRECATED. 2017-12-29 06:39:09 -05:00
test-integration-flaky hack: Have TIMEOUT take -test.count into account when testing for flakiness 2019-02-08 18:36:31 +00:00
test-integration-shell Protect images in the integration/ suite 2017-08-09 11:02:57 -04:00

This directory holds scripts called by make.sh in the parent directory.

Each script is named after the bundle it creates. They should not be called directly - instead, pass it as argument to make.sh, for example:

./hack/make.sh binary ubuntu

# Or to run all default bundles:
./hack/make.sh

To add a bundle:

  • Create a shell-compatible file here
  • Add it to $DEFAULT_BUNDLES in make.sh