Skip to content

Commit 44cdbd4

Browse files
authored
Improve Pipfile for Docker image (openvinotoolkit#147)
Remove `pip install tensorflow-serving-api` step in Dockerfile: all requirements installed with pipenv now. Add paddlegan and itk requirements
1 parent ed34f41 commit 44cdbd4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+659
-153
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

.openshift/Pipfile .docker/Pipfile

+25-23
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,36 @@ name = "pypi"
55

66
[packages]
77
aiohttp = ">=3.7.4"
8-
notebook = ">=6.0.2"
9-
jupyterhub = "==1.1.0"
10-
jupyterlab = "==3.0.16"
11-
jupyter-kernel-gateway = "==2.4.0"
12-
jupyter-nbrequirements = "*"
13-
supervisor = "==4.1.0"
14-
openvino-dev = "==2021.4"
15-
matplotlib = "<3.4"
16-
geffnet = "==0.9.8"
178
fastseg = "*"
18-
onnx = "*"
19-
ipywidgets = "*"
20-
torch = "<=1.7.1+cpu,>=1.5.1+cpu"
21-
torchvision = "<=0.8.2+cpu,>=0.6.1+cpu"
22-
networkx = ">=1.11"
23-
defusedxml = ">=0.5.0"
24-
tensorflow = "==2.4.2"
25-
ipython = "==7.10"
26-
importlib-metadata = "==3.7.3"
27-
ipykernel = "==5.5.0"
28-
pyvista = "*"
299
gdown = "*"
30-
pytube = "*"
31-
nbval = "*"
10+
geffnet = "==0.9.8"
3211
grpcio = "*"
12+
ipywidgets = "*"
13+
itkwidgets = "==0.23.1"
14+
jedi = "==0.17.2"
15+
jupyter-nbrequirements = "*"
16+
jupyterhub = "==1.1.0"
17+
jupyterlab = "*"
18+
matplotlib = "<3.4"
19+
nbval = "*"
20+
openvino-dev = {extras = ["onnx","tensorflow2"], version = "==2021.4"}
21+
openvino-extensions="*"
22+
paddle2onnx = ">=0.6"
23+
paddlepaddle = "~=2.1.1"
24+
Pillow = "==8.2.*"
25+
ppgan = ">=2.0.0"
3326
PVGeo = "*"
27+
pytube = "*"
28+
pyvista = "*"
29+
supervisor = "==4.1.0"
30+
tensorflow-serving-api = "==2.4.*"
31+
torch = "<=1.7.1+cpu,>=1.5.1+cpu"
32+
torchvision = "<=0.8.2+cpu,>=0.6.1+cpu"
33+
tqdm = "*"
34+
3435

3536
[dev-packages]
3637

3738
[requires]
38-
python_version = "3.7"
39+
python_version = "3.8"
40+

.openshift/Pipfile.lock .docker/Pipfile.lock

+631-126
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Dockerfile

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
3131

3232

3333
# Copying in override assemble/run scripts
34-
COPY .openshift/.s2i/bin /tmp/scripts
34+
COPY .docker/.s2i/bin /tmp/scripts
3535
# Copying in source code
36-
COPY .openshift /tmp/src
36+
COPY .docker /tmp/src
3737

3838
# Git on Windows may convert line endings. Run dos2unix to enable
3939
# building the image when the scripts have CRLF line endings.
@@ -44,8 +44,7 @@ RUN dos2unix /tmp/src/builder/*
4444
RUN chown -R 1001:0 /tmp/scripts /tmp/src
4545
USER 1001
4646
RUN /tmp/scripts/assemble
47-
RUN pip install tensorflow-serving-api
48-
47+
RUN pip check
4948
USER root
5049
RUN dos2unix /opt/app-root/bin/*sh
5150
RUN yum remove -y dos2unix

0 commit comments

Comments
 (0)