beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dockerfile: move comments to fix build error

Browse source 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
This commit is contained in:
unclejack 2017-03-16 13:59:10 +02:00
parent 52143aee95
commit c7c9235946
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -192,13 +192,13 @@ RUN set -x \
# 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 4a08d04aef0595322e1b5ac7c52f28a931da85a5 ENV DOCKER_PY_COMMIT 4a08d04aef0595322e1b5ac7c52f28a931da85a5
# To run integration tests docker-pycreds is required.
# Before running the integration tests conftest.py is
# loaded which results in loads auth.py that
# imports the docker-pycreds module.
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 \
# To run integration tests docker-pycreds is required.
# Before running the integration tests conftest.py is
# loaded which results in loads auth.py that
# imports the docker-pycreds module.
&& pip install docker-pycreds==0.2.1 \ && pip install docker-pycreds==0.2.1 \
&& pip install -r test-requirements.txt && pip install -r test-requirements.txt

6
Dockerfile.aarch64
View file

@ -143,13 +143,13 @@ RUN set -x \
# 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 4a08d04aef0595322e1b5ac7c52f28a931da85a5 ENV DOCKER_PY_COMMIT 4a08d04aef0595322e1b5ac7c52f28a931da85a5
# Before running the integration tests conftest.py is
# loaded which results in loads auth.py that
# imports the docker-pycreds module.
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 \
&& pip install wheel \ && pip install wheel \
# Before running the integration tests conftest.py is
# loaded which results in loads auth.py that
# imports the docker-pycreds module.
&& pip install docker-pycreds==0.2.1 \ && pip install docker-pycreds==0.2.1 \
&& pip install -r test-requirements.txt && pip install -r test-requirements.txt