Browse code
Merge pull request #24311 from ShevYan/incorrect-comments-in-dockerfile
Dockerfile's comments for "Run the test suite" are out of date becaus…
Michael Crosby authored on 2016/08/13 07:53:06Showing 6 changed files
- Dockerfile
- Dockerfile.aarch64
- Dockerfile.armhf
- Dockerfile.ppc64le
- Dockerfile.s390x
- builder/dockerfile/parser/testfiles/docker/Dockerfile
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
| 10 | 10 |
# |
| 11 | 11 |
# # Run the test suite: |
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py |
|
| 13 | 13 |
# |
| 14 | 14 |
# # Publish a release: |
| 15 | 15 |
# docker run --privileged \ |
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
| 10 | 10 |
# |
| 11 | 11 |
# # Run the test suite: |
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py |
|
| 13 | 13 |
# |
| 14 | 14 |
# Note: AppArmor used to mess with privileged mode, but this is no longer |
| 15 | 15 |
# the case. Therefore, you don't have to disable it anymore. |
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
| 10 | 10 |
# |
| 11 | 11 |
# # Run the test suite: |
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py |
|
| 13 | 13 |
# |
| 14 | 14 |
# Note: AppArmor used to mess with privileged mode, but this is no longer |
| 15 | 15 |
# the case. Therefore, you don't have to disable it anymore. |
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
| 10 | 10 |
# |
| 11 | 11 |
# # Run the test suite: |
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py |
|
| 13 | 13 |
# |
| 14 | 14 |
# Note: AppArmor used to mess with privileged mode, but this is no longer |
| 15 | 15 |
# the case. Therefore, you don't have to disable it anymore. |
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
| 10 | 10 |
# |
| 11 | 11 |
# # Run the test suite: |
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py |
|
| 13 | 13 |
# |
| 14 | 14 |
# Note: AppArmor used to mess with privileged mode, but this is no longer |
| 15 | 15 |
# the case. Therefore, you don't have to disable it anymore. |
| ... | ... |
@@ -9,7 +9,7 @@ |
| 9 | 9 |
# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash |
| 10 | 10 |
# |
| 11 | 11 |
# # Run the test suite: |
| 12 |
-# docker run --privileged docker hack/make.sh test |
|
| 12 |
+# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py |
|
| 13 | 13 |
# |
| 14 | 14 |
# # Publish a release: |
| 15 | 15 |
# docker run --privileged \ |