Browse code
Update docker-py to current master (~docker-py 1.3.1)
The docker-py commit used in the standard `Dockerfile` is from Feb. 2015
and is out of date with the current API level and has fixes for things
like the new docker cli config location and registry v2 changes/API
responses as well.
Also pass "NOT_ON_HOST=true" to docker-py test suite so that tests
relying on direct HOST interaction (versus running in a container) are
skipped.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Phil Estes authored on 2015/07/15 00:54:37Showing 2 changed files
| ... | ... |
@@ -131,7 +131,7 @@ RUN set -x \ |
| 131 | 131 |
&& rm -rf "$GOPATH" |
| 132 | 132 |
|
| 133 | 133 |
# Get the "docker-py" source so we can run their integration tests |
| 134 |
-ENV DOCKER_PY_COMMIT 91985b239764fe54714fa0a93d52aa362357d251 |
|
| 134 |
+ENV DOCKER_PY_COMMIT 8a87001d09852058f08a807ab6e8491d57ca1e88 |
|
| 135 | 135 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 136 | 136 |
&& cd /docker-py \ |
| 137 | 137 |
&& git checkout -q $DOCKER_PY_COMMIT |
| ... | ... |
@@ -12,7 +12,7 @@ set -e |
| 12 | 12 |
} |
| 13 | 13 |
|
| 14 | 14 |
# exporting PYTHONPATH to import "docker" from our local docker-py |
| 15 |
- test_env PYTHONPATH="$dockerPy" python "$dockerPy/tests/integration_test.py" |
|
| 15 |
+ test_env PYTHONPATH="$dockerPy" NOT_ON_HOST=true python "$dockerPy/tests/integration_test.py" |
|
| 16 | 16 |
|
| 17 | 17 |
bundle .integration-daemon-stop |
| 18 | 18 |
) 2>&1 | tee -a "$DEST/test.log" |