Skip to content

upgrade pillow etc. to fix safety issues in 1.4.0 dockerfiles #63

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 2 commits into from
Apr 2, 2020
Merged

upgrade pillow etc. to fix safety issues in 1.4.0 dockerfiles #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5539c91
upgrade pillow etc. to fix safety issues in 1.4.0 dockerfiles
YYStreet Apr 1, 2020
5e7bb4c
Merge branch 'master' into master
YYStreet Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions docker/1.4.0/py2/Dockerfile.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ RUN conda install -c \
&& conda install -y \
scikit-learn==0.20.3 \
pandas==0.24.2 \
pillow==6.2.1 \
h5py==2.9.0 \
requests==2.22.0 \
&& conda install \
pytorch==$PYTORCH_VERSION \
torchvision==$TORCHVISION_VERSION cpuonly -c pytorch \
&& conda clean -ya \
&& pip install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org \
&& pip install mxnet-model-server==$MMS_VERSION
&& pip install mxnet-model-server==$MMS_VERSION \
&& pip install --no-cache-dir pillow==6.2.2

RUN useradd -m model-server \
&& mkdir -p /home/model-server/tmp \
Expand All @@ -81,6 +81,9 @@ RUN pip install --no-cache-dir "sagemaker-pytorch-inference<2"

RUN curl https://aws-dlc-licenses.s3.amazonaws.com/pytorch-1.4.0/license.txt -o /license.txt

RUN conda install -y -c conda-forge pyyaml==5.3.1
RUN pip install sagemaker-containers==2.8.6 urllib3==1.25.8

EXPOSE 8080 8081
ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
CMD ["mxnet-model-server", "--start", "--mms-config", "/home/model-server/config.properties"]
7 changes: 5 additions & 2 deletions docker/1.4.0/py2/Dockerfile.gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN conda install -c \
&& conda install -y scikit-learn==0.20.3 \
h5py==2.9.0 \
pandas==0.24.2 \
pillow==6.2.1 \
requests==2.22.0 \
&& conda install -c \
pytorch \
Expand All @@ -80,7 +79,8 @@ RUN conda install -c \
&& conda clean -ya \
&& /opt/conda/bin/conda config --set ssl_verify False \
&& pip install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org \
&& pip install mxnet-model-server==$MMS_VERSION
&& pip install mxnet-model-server==$MMS_VERSION \
&& pip install --no-cache-dir pillow==6.2.2

RUN useradd -m model-server \
&& mkdir -p /home/model-server/tmp \
Expand All @@ -105,6 +105,9 @@ RUN pip install --no-cache-dir "sagemaker-pytorch-inference<2"

RUN curl https://aws-dlc-licenses.s3.amazonaws.com/pytorch-1.4.0/license.txt -o /license.txt

RUN conda install -y -c conda-forge pyyaml==5.3.1
RUN pip install sagemaker-containers==2.8.6 urllib3==1.25.8

EXPOSE 8080 8081
ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
CMD ["mxnet-model-server", "--start", "--mms-config", "/home/model-server/config.properties"]
7 changes: 5 additions & 2 deletions docker/1.4.0/py3/Dockerfile.cpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ RUN conda install -c \
&& conda install -y \
scikit-learn==0.21.2 \
pandas==0.25.0 \
pillow==6.2.1 \
h5py==2.9.0 \
requests==2.22.0 \
&& conda install \
Expand All @@ -65,7 +64,8 @@ RUN conda install -c \
&& conda clean -ya \
&& pip install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org \
&& ln -s /opt/conda/bin/pip /usr/local/bin/pip3 \
&& pip install mxnet-model-server==$MMS_VERSION
&& pip install mxnet-model-server==$MMS_VERSION \
&& pip install --no-cache-dir pillow==7.1.0

RUN useradd -m model-server \
&& mkdir -p /home/model-server/tmp \
Expand All @@ -80,6 +80,9 @@ RUN pip install --no-cache-dir "sagemaker-pytorch-inference<2"

RUN curl https://aws-dlc-licenses.s3.amazonaws.com/pytorch-1.4.0/license.txt -o /license.txt

RUN conda install -y -c conda-forge pyyaml==5.3.1
RUN pip install sagemaker-containers==2.8.6

EXPOSE 8080 8081
ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
CMD ["mxnet-model-server", "--start", "--mms-config", "/home/model-server/config.properties"]
7 changes: 5 additions & 2 deletions docker/1.4.0/py3/Dockerfile.gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ RUN conda install -c \
&& conda install -y \
scikit-learn==0.21.2 \
pandas==0.25.0 \
pillow==6.2.1 \
h5py==2.9.0 \
requests==2.22.0 \
&& conda install -c \
Expand All @@ -82,7 +81,8 @@ RUN conda install -c \
&& /opt/conda/bin/conda config --set ssl_verify False \
&& pip install --upgrade pip --trusted-host pypi.org --trusted-host files.pythonhosted.org \
&& ln -s /opt/conda/bin/pip /usr/local/bin/pip3 \
&& pip install mxnet-model-server==$MMS_VERSION
&& pip install mxnet-model-server==$MMS_VERSION \
&& pip install --no-cache-dir pillow==7.1.0

RUN useradd -m model-server \
&& mkdir -p /home/model-server/tmp \
Expand All @@ -97,6 +97,9 @@ RUN pip install --no-cache-dir "sagemaker-pytorch-inference<2"

RUN curl https://aws-dlc-licenses.s3.amazonaws.com/pytorch-1.4.0/license.txt -o /license.txt

RUN conda install -y -c conda-forge pyyaml==5.3.1
RUN pip install sagemaker-containers==2.8.6

EXPOSE 8080 8081
ENTRYPOINT ["python", "/usr/local/bin/dockerd-entrypoint.py"]
CMD ["mxnet-model-server", "--start", "--mms-config", "/home/model-server/config.properties"]
5 changes: 3 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ def read(fname):
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.6',
],
install_requires=['numpy==1.16.4', 'Pillow==6.2.0', 'retrying==1.3.3', 'sagemaker-containers==2.5.4',
'six==1.12.0', 'requests_mock==1.6.0', 'sagemaker-inference==1.2.2',

install_requires=['numpy==1.16.4', 'Pillow>=6.2.0', 'retrying==1.3.3', 'sagemaker-containers>=2.5.4',
'six==1.12.0', 'requests_mock==1.6.0', 'sagemaker-inference>=1.2.2',
'retrying==1.3.3'],
extras_require={
'test': ['boto3==1.10.32', 'coverage==4.5.3', 'docker-compose==1.23.2', 'flake8==3.7.7', 'Flask==1.1.1',
Expand Down