p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
f3b1a30e52efd04bb4a162576e0eb401445c87c4
docker-cli/components/engine/hack
History
Kir Kolyshkin f3b1a30e52 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>
(cherry picked from commit 228bc35e824d09a6f40d60619808462124f0af31)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e9ecd5e486c591979e34782025bb849f7faf8eba
Component: engine
2019-02-19 22:35:50 +01:00
..
ci
Windows:Tie busybox to version
2018-11-30 01:38:11 +01:00
dockerfile/install
Apply git bundles for CVE-2019-5736
2019-02-06 00:25:54 +00:00
integration-cli-on-swarm
Various code-cleanup
2018-05-23 17:50:54 +02:00
make
make test-integration: use correct dockerd binary
2019-02-19 22:35:50 +01:00
test
Skip some tests in certain condition to run with e2e image
2018-03-29 09:10:39 +02:00
validate
Fix swagger volume type generation
2018-05-14 13:46:20 -04:00
dind
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
2017-02-13 11:01:54 -08:00
generate-authors.sh
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
2017-02-13 11:01:54 -08:00
generate-swagger-api.sh
Fix swagger volume type generation
2018-05-14 13:46:20 -04:00
make.ps1
hack/make.ps1: don't use ENV GO_VERSION
2018-08-15 12:16:39 +03:00
make.sh
Fix the several typos detected by github.com/client9/misspell
2018-08-09 00:45:00 +09:00
README.md
Remove references to old release process
2018-05-18 18:28:43 +00:00
vendor.sh
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
2017-02-13 11:01:54 -08:00

README.md

About

This directory contains a collection of scripts used to build and manage this repository. If there are any issues regarding the intention of a particular script (or even part of a certain script), please reach out to us. It may help us either refine our current scripts, or add on new ones that are appropriate for a given use case.

DinD (dind.sh)

DinD is a wrapper script which allows Docker to be run inside a Docker container. DinD requires the container to be run with privileged mode enabled.

Generate Authors (generate-authors.sh)

Generates AUTHORS; a file with all the names and corresponding emails of individual contributors. AUTHORS can be found in the home directory of this repository.

Make

There are two make files, each with different extensions. Neither are supposed to be called directly; only invoke make. Both scripts run inside a Docker container.

make.ps1

  • The Windows native build script that uses PowerShell semantics; it is limited unlike hack\make.sh since it does not provide support for the full set of operations provided by the Linux counterpart, make.sh. However, make.ps1 does provide support for local Windows development and Windows to Windows CI. More information is found within make.ps1 by the author, @jhowardmsft

make.sh

  • Referenced via make test when running tests on a local machine, or directly referenced when running tests inside a Docker development container.
  • When running on a local machine, make test to run all tests found in test, test-unit, test-integration, and test-docker-py on your local machine. The default timeout is set in make.sh to 60 minutes (${TIMEOUT:=60m}), since it currently takes up to an hour to run all of the tests.
  • When running inside a Docker development container, hack/make.sh does not have a single target that runs all the tests. You need to provide a single command line with multiple targets that performs the same thing. An example referenced from Run targets inside a development container: root@5f8630b873fe:/go/src/github.com/moby/moby# hack/make.sh dynbinary binary cross test-unit test-integration test-docker-py
  • For more information related to testing outside the scope of this README, refer to Run tests and test documentation

Vendor (vendor.sh)

A shell script that is a wrapper around Vndr. For information on how to use this, please refer to vndr's README