Skip to content

Add shell instruction to serving Dockerfiles #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 2, 2020
Merged

Add shell instruction to serving Dockerfiles #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
78a9df5
Set shell for each API-serving image
RobertLucian Jun 1, 2020
75428a7
Clarify that users can easily install w/ pip/conda
RobertLucian Jun 1, 2020
6cd877d
Better sentence structure
RobertLucian Jun 1, 2020
37e4070
Remove caches with --no-cache-dir & conda clean -a
RobertLucian Jun 2, 2020
6d32c23
Place packages onto multiple lines in Dockerfiles
RobertLucian Jun 2, 2020
cf76bc7
Merge branch 'master' into improvement/pip-install
RobertLucian Jun 2, 2020
3a1f7ed
Merge branch 'master' into improvement/pip-install
deliahu Jun 2, 2020
e85c48f
Update Dockerfile
deliahu Jun 2, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion docs/deployments/system-packages.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Cortex's base Docker images are listed below. Depending on the Cortex Predictor

Note: the images listed above use the `-slim` suffix; Cortex's default API images are not `-slim`, since they have additional dependencies installed to cover common use cases. If you are building your own Docker image, starting with a `-slim` Predictor image will result in a smaller image size.

The sample Dockerfile below inherits from Cortex's Python CPU serving image and installs the `tree` system package.
The sample Dockerfile below inherits from Cortex's Python CPU serving image, and installs 3 packages. `tree` is a system package and `pandas` and `rdkit` are Python packages.

<!-- CORTEX_VERSION_BRANCH_STABLE -->
```dockerfile
Expand All @@ -68,6 +68,10 @@ FROM cortexlabs/python-predictor-cpu-slim:master
RUN apt-get update \
&& apt-get install -y tree \
&& apt-get clean && rm -rf /var/lib/apt/lists/*

RUN pip install --no-cache-dir pandas \
&& conda install -y conda-forge::rdkit \
&& conda clean -a
```

### Build and push to a container registry
Expand Down
10 changes: 4 additions & 6 deletions images/onnx-predictor-cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip
echo "source ~/.env" >> ~/.bashrc

ENV BASH_ENV=~/.env
SHELL ["/bin/bash", "-c"]

COPY pkg/workloads/cortex/serve/requirements.txt /src/cortex/serve/requirements.txt

# use /bin/bash to run in conda environment
RUN /bin/bash -c \
"pip install --no-cache-dir \
-r /src/cortex/serve/requirements.txt \
onnxruntime==1.2.0"
RUN pip install --no-cache-dir -r \
/src/cortex/serve/requirements.txt \
onnxruntime==1.2.0

ARG SLIM="false"
RUN test "${SLIM}" = "true" || ( \
Expand Down
10 changes: 4 additions & 6 deletions images/onnx-predictor-gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,12 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip
echo "source ~/.env" >> ~/.bashrc

ENV BASH_ENV=~/.env
SHELL ["/bin/bash", "-c"]

COPY pkg/workloads/cortex/serve/requirements.txt /src/cortex/serve/requirements.txt

# use /bin/bash to run in conda environment
RUN /bin/bash -c \
"pip install --no-cache-dir \
-r /src/cortex/serve/requirements.txt \
onnxruntime-gpu==1.2.0"
RUN pip install --no-cache-dir -r \
/src/cortex/serve/requirements.txt \
onnxruntime-gpu==1.2.0

ARG SLIM="false"
RUN test "${SLIM}" = "true" || ( \
Expand Down
51 changes: 24 additions & 27 deletions images/python-predictor-cpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,11 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip
echo "source ~/.env" >> ~/.bashrc

ENV BASH_ENV=~/.env
SHELL ["/bin/bash", "-c"]

COPY pkg/workloads/cortex/serve/requirements.txt /src/cortex/serve/requirements.txt

# use /bin/bash to run in conda environment
RUN /bin/bash -c \
"pip install --no-cache-dir \
-r /src/cortex/serve/requirements.txt"
RUN pip install --no-cache-dir -r \
/src/cortex/serve/requirements.txt

ARG SLIM="false"
RUN test "${SLIM}" = "true" || ( \
Expand All @@ -53,28 +51,27 @@ RUN test "${SLIM}" = "true" || ( \
libpng-dev \
libsndfile1 \
&& apt-get clean -qq && rm -rf /var/lib/apt/lists/* \
&& /bin/bash -c \
"pip install --no-cache-dir \
cloudpickle==1.4.1 \
Cython==0.29.17 \
joblib==0.14.1 \
Keras==2.3.1 \
nltk==3.5 \
np-utils==0.5.12.1 \
opencv-python==4.2.0.34 \
pandas==1.0.3 \
Pillow==7.1.2 \
scikit-image==0.17.1 \
scikit-learn==0.22.2.post1 \
scipy==1.4.1 \
six==1.14.0 \
statsmodels==0.11.1 \
sympy==1.5.1 \
tensorflow-cpu==2.1.0 \
tensorflow-hub==0.8.0 \
https://download.pytorch.org/whl/cpu/torch-1.5.0%2Bcpu-cp36-cp36m-linux_x86_64.whl \
https://download.pytorch.org/whl/cpu/torchvision-0.6.0%2Bcpu-cp36-cp36m-linux_x86_64.whl \
xgboost==1.0.2" \
&& pip install --no-cache-dir \
cloudpickle==1.4.1 \
Cython==0.29.17 \
joblib==0.14.1 \
Keras==2.3.1 \
nltk==3.5 \
np-utils==0.5.12.1 \
opencv-python==4.2.0.34 \
pandas==1.0.3 \
Pillow==7.1.2 \
scikit-image==0.17.1 \
scikit-learn==0.22.2.post1 \
scipy==1.4.1 \
six==1.14.0 \
statsmodels==0.11.1 \
sympy==1.5.1 \
tensorflow-cpu==2.1.0 \
tensorflow-hub==0.8.0 \
https://download.pytorch.org/whl/cpu/torch-1.5.0%2Bcpu-cp36-cp36m-linux_x86_64.whl \
https://download.pytorch.org/whl/cpu/torchvision-0.6.0%2Bcpu-cp36-cp36m-linux_x86_64.whl \
xgboost==1.0.2 \
)

COPY pkg/workloads/cortex/consts.py /src/cortex
Expand Down
50 changes: 24 additions & 26 deletions images/python-predictor-gpu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip
echo "source ~/.env" >> ~/.bashrc

ENV BASH_ENV=~/.env
SHELL ["/bin/bash", "-c"]

COPY pkg/workloads/cortex/serve/requirements.txt /src/cortex/serve/requirements.txt

RUN /bin/bash -c \
"pip install --no-cache-dir \
-r /src/cortex/serve/requirements.txt"
RUN pip install --no-cache-dir -r \
/src/cortex/serve/requirements.txt

ARG SLIM="false"
RUN test "${SLIM}" = "true" || ( \
Expand All @@ -55,28 +54,27 @@ RUN test "${SLIM}" = "true" || ( \
libnvinfer6=6.0.1-1+cuda10.1 \
libnvinfer-plugin6=6.0.1-1+cuda10.1 \
&& apt-get clean -qq && rm -rf /var/lib/apt/lists/* \
&& /bin/bash -c \
"pip install --no-cache-dir \
cloudpickle==1.4.1 \
Cython==0.29.17 \
joblib==0.14.1 \
Keras==2.3.1 \
nltk==3.5 \
np-utils==0.5.12.1 \
opencv-python==4.2.0.34 \
pandas==1.0.3 \
Pillow==7.1.2 \
scikit-image==0.17.1 \
scikit-learn==0.22.2.post1 \
scipy==1.4.1 \
six==1.14.0 \
statsmodels==0.11.1 \
sympy==1.5.1 \
tensorflow-gpu==2.1.0 \
tensorflow-hub==0.8.0 \
https://download.pytorch.org/whl/cu101/torch-1.5.0%2Bcu101-cp36-cp36m-linux_x86_64.whl \
https://download.pytorch.org/whl/cu101/torchvision-0.6.0%2Bcu101-cp36-cp36m-linux_x86_64.whl \
xgboost==1.0.2" \
&& pip install --no-cache-dir \
cloudpickle==1.4.1 \
Cython==0.29.17 \
joblib==0.14.1 \
Keras==2.3.1 \
nltk==3.5 \
np-utils==0.5.12.1 \
opencv-python==4.2.0.34 \
pandas==1.0.3 \
Pillow==7.1.2 \
scikit-image==0.17.1 \
scikit-learn==0.22.2.post1 \
scipy==1.4.1 \
six==1.14.0 \
statsmodels==0.11.1 \
sympy==1.5.1 \
tensorflow-gpu==2.1.0 \
tensorflow-hub==0.8.0 \
https://download.pytorch.org/whl/cu101/torch-1.5.0%2Bcu101-cp36-cp36m-linux_x86_64.whl \
https://download.pytorch.org/whl/cu101/torchvision-0.6.0%2Bcu101-cp36-cp36m-linux_x86_64.whl \
xgboost==1.0.2 \
)

COPY pkg/workloads/cortex/consts.py /src/cortex
Expand Down
19 changes: 8 additions & 11 deletions images/tensorflow-predictor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ RUN /opt/conda/bin/conda create -n env -c conda-forge python=$PYTHONVERSION pip
echo "source ~/.env" >> ~/.bashrc

ENV BASH_ENV=~/.env
SHELL ["/bin/bash", "-c"]

COPY pkg/workloads/cortex/serve/requirements.txt /src/cortex/serve/requirements.txt

# use /bin/bash to run in conda environment
RUN /bin/bash -c \
"pip install --no-cache-dir \
-r /src/cortex/serve/requirements.txt \
tensorflow-cpu==2.1.0 \
tensorflow-serving-api==2.1.0"
RUN pip install --no-cache-dir -r \
/src/cortex/serve/requirements.txt \
tensorflow-cpu==2.1.0 \
tensorflow-serving-api==2.1.0

ARG SLIM="false"
RUN test "${SLIM}" = "true" || ( \
Expand All @@ -55,10 +53,9 @@ RUN test "${SLIM}" = "true" || ( \
libpng-dev \
libsndfile1 \
&& apt-get clean -qq && rm -rf /var/lib/apt/lists/* \
&& /bin/bash -c \
"pip install --no-cache-dir \
opencv-python==4.2.0.34 \
tensorflow-hub==0.8.0" \
&& pip install --no-cache-dir \
opencv-python==4.2.0.34 \
tensorflow-hub==0.8.0 \
)

COPY pkg/workloads/cortex/consts.py /src/cortex/
Expand Down