clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11373 from tianon/move-hack-scripts-back

Browse Source 
Move scripts back to hack/, leave docs in project/
This commit is contained in:
Jessie Frazelle
2015-03-13 15:26:54 -07:00
parent 02c1dd899a 949a21b55f
commit d2f925fb27
38 changed files with 13 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/sources/project/set-up-dev-env.md
+2 -2
View File
@@ -242,9 +242,9 @@ build and run a `docker` binary in your container.
4. From the `/go/src/github.com/docker/docker` directory make a `docker` binary with the `make.sh` script.
root@5f8630b873fe:/go/src/github.com/docker/docker# project/make.sh binary
root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh binary
You only call `project/make.sh` to build a binary _inside_ a Docker
You only call `hack/make.sh` to build a binary _inside_ a Docker
development container as you are now. On your host, you'll use `make`
commands (more about this later).
docs/sources/project/test-and-docs.md
+5 -5
View File
@@ -133,7 +133,7 @@ Run the entire test suite on your current repository:
### Run test targets inside the development container
If you are working inside a Docker development container, you use the
`project/make.sh` script to run tests. The `project/make.sh` script doesn't
`hack/make.sh` script to run tests. The `hack/make.sh` script doesn't
have a single target that runs all the tests. Instead, you provide a single
commmand line with multiple targets that does the same thing.
@@ -148,9 +148,9 @@ Try this now.
$ docker run --privileged --rm -ti -v `pwd`:/go/src/github.com/docker/docker dry-run-test /bin/bash
3. Run the tests using the `project/make.sh` script.
3. Run the tests using the `hack/make.sh` script.
root@5f8630b873fe:/go/src/github.com/docker/docker# project/make.sh dynbinary binary cross test-unit test-integration test-integration-cli test-docker-py
root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit test-integration test-integration-cli test-docker-py
The tests run just as they did within your local host.
@@ -158,7 +158,7 @@ Try this now.
Of course, you can also run a subset of these targets too. For example, to run
just the unit tests:
root@5f8630b873fe:/go/src/github.com/docker/docker# project/make.sh dynbinary binary cross test-unit
root@5f8630b873fe:/go/src/github.com/docker/docker# hack/make.sh dynbinary binary cross test-unit
Most test targets require that you build these precursor targets first:
`dynbinary binary cross`
@@ -174,7 +174,7 @@ your local host you can run the `TestBuild` test with this command:
To run the same test inside your Docker development container, you do this:
root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-run ^TestBuild$' project/make.sh
root@5f8630b873fe:/go/src/github.com/docker/docker# TESTFLAGS='-run ^TestBuild$' hack/make.sh
## If test under Boot2Docker fail do to space errors