docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14628 from estesp/update-docker-py 

Update docker-py commit to current master (~1.3.1 release)
This commit is contained in:
Alexander Morozov 2015-07-22 12:41:41 -07:00
parent 1c6fe58efc 65fb04228e
commit c328e0c827
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -137,7 +137,7 @@ RUN set -x \
&& rm -rf "$GOPATH" && rm -rf "$GOPATH"
# Get the "docker-py" source so we can run their integration tests # Get the "docker-py" source so we can run their integration tests
ENV DOCKER_PY_COMMIT 91985b239764fe54714fa0a93d52aa362357d251 ENV DOCKER_PY_COMMIT 8a87001d09852058f08a807ab6e8491d57ca1e88
RUN git clone https://github.com/docker/docker-py.git /docker-py \ RUN git clone https://github.com/docker/docker-py.git /docker-py \
&& cd /docker-py \ && cd /docker-py \
&& git checkout -q $DOCKER_PY_COMMIT && git checkout -q $DOCKER_PY_COMMIT

2
hack/make/test-docker-py
View File

@ -12,7 +12,7 @@ set -e
} }
# exporting PYTHONPATH to import "docker" from our local docker-py # exporting PYTHONPATH to import "docker" from our local docker-py
test_env PYTHONPATH="$dockerPy" python "$dockerPy/tests/integration_test.py" test_env PYTHONPATH="$dockerPy" NOT_ON_HOST=true python "$dockerPy/tests/integration_test.py"
bundle .integration-daemon-stop bundle .integration-daemon-stop
) 2>&1 | tee -a "$DEST/test.log" ) 2>&1 | tee -a "$DEST/test.log"