Skip to content

Commit

Permalink
Is539/master build fails (#540)
Browse files Browse the repository at this point in the history
* minor cleanup

* Fixed storage Dockerfile image build:
 - Added workaround for pypa/pip#6197
 - Froze python2 requirements (virtualenv py2.7 would fail to install numpy)

* Fixes director Dockerfile using same workaround in pip as with storage

* Applies pip workaround to sidecar Dockerfile

* Applies pip workaround to webserver Dockerfile

* Applied pip workaround to backend dynamic services

* pip compiled py27.in -> py27.txt (pip-tools)
 Changes to be committed:
	new file:   services/storage/requirements/py27.in
	modified:   services/storage/requirements/py27.txt
  • Loading branch information
pcrespov authored Jan 29, 2019
1 parent b0ab41c commit 14b4dac
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:

# test python, linting ----------------------------------------------------------------------
- stage: unit testing
name: Python linting
name: python linting
language: python
python:
- "3.6"
Expand Down
6 changes: 4 additions & 2 deletions services/dy-2Dgraph/use-cases/cc/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ USER $NB_USER

# install requirements --------------------------------------------------------
COPY --chown=jovyan:users cc/requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
# TODO: tmp workaround for https://github.com/pypa/pip/issues/6197
RUN pip --cache-dir=/pipcache install -r requirements.txt &&\
rm -rf /pipcache
# prepare for booting ---------------------------------------------------------
COPY --chown=jovyan:users docker /docker
# set of arguments to copy the right notebook ---------------------------------
Expand All @@ -36,4 +38,4 @@ ARG NOTEBOOK_NAME
ARG NOTEBOOK_FOLDER_NAME
# copy the notebook in the image
COPY --chown=jovyan:users cc/${NOTEBOOK_FOLDER_NAME}/${NOTEBOOK_NAME} ${NOTEBOOK_NAME}
ENTRYPOINT [ "/bin/bash", "/docker/boot.sh" ]
ENTRYPOINT [ "/bin/bash", "/docker/boot.sh" ]
7 changes: 5 additions & 2 deletions services/dy-2Dgraph/use-cases/kember/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ LABEL maintainer="sanderegg"

# install requirements --------------------------------------------------------
COPY --chown=jovyan:users kember/requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt
# TODO: tmp workaround for https://github.com/pypa/pip/issues/6197
RUN pip --cache-dir=/pipcache install -r requirements.txt &&\
rm -rf /pipcache


# prepare for booting ---------------------------------------------------------
COPY --chown=jovyan:users docker /docker
Expand All @@ -29,4 +32,4 @@ FROM common AS production
ARG NOTEBOOK_NAME
# copy the notebook in the image
COPY --chown=jovyan:users kember/${NOTEBOOK_NAME} ${NOTEBOOK_NAME}
ENTRYPOINT [ "/bin/bash", "/docker/boot.sh" ]
ENTRYPOINT [ "/bin/bash", "/docker/boot.sh" ]

0 comments on commit 14b4dac

Please sign in to comment.