2c8018f4bd
The `docker info` command compares the installed version
of containerd using a Git-sha. We currently use a tag for
this, but that tag is not returned by the version-API of
containerd, resulting in the `docker info` output to show:
containerd version: 89623f28b87a6004d4b785663257362d1658a729 (expected: v1.0.0)
This patch changes the `v1.0.0` tag to the commit that
corresponds with the tag, so that the `docker info` output
does not show the `expected:` string.
This should be considered a temporary workaround; the check
for the exact version of containerd that's installed was needed
when we still used the 0.2.x branch, because it did not have
stable releases yet.
With containerd reaching 1.0, and using SemVer, we can likely
do a comparison for "Major" version, or make this a "packaging"
issue, and remove the check entirely (we can still _print_ the
version that's installed if we think it's usefule).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
||
|---|---|---|
| .. | ||
| ci | ||
| dockerfile | ||
| integration-cli-on-swarm | ||
| make | ||
| test | ||
| validate | ||
| dind | ||
| generate-authors.sh | ||
| generate-swagger-api.sh | ||
| make.ps1 | ||
| make.sh | ||
| README.md | ||
| vendor.sh | ||
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.shsince it does not provide support for the full set of operations provided by the Linux counterpart,make.sh. However,make.ps1does provide support for local Windows development and Windows to Windows CI. More information is found withinmake.ps1by the author, @jhowardmsft
make.sh
- Referenced via
make testwhen running tests on a local machine, or directly referenced when running tests inside a Docker development container. - When running on a local machine,
make testto run all tests found intest,test-unit,test-integration, andtest-docker-pyon your local machine. The default timeout is set inmake.shto 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.shdoes 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
Release (release.sh)
Releases any bundles built by make on a public AWS S3 bucket.
For information regarding configuration, please view release.sh.
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