[submarine] branch master updated: SUBMARINE-1367. Fix submarine-sdk build in Dockerfile

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdmikechen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git


The following commit(s) were added to refs/heads/master by this push:
     new 8360aec0 SUBMARINE-1367. Fix submarine-sdk build in Dockerfile
8360aec0 is described below

commit 8360aec09b8640dc55d22a913cf7f8280f93b180
Author: cdmikechen <cd...@apache.org>
AuthorDate: Sun Feb 26 11:27:04 2023 +0800

    SUBMARINE-1367. Fix submarine-sdk build in Dockerfile
    
    ### What is this PR for?
    According to issue https://issues.apache.org/jira/browse/SUBMARINE-1365
    We have fixed some of the problems in the cicd process, but the docker image still build with exceptions.
    
    ### What type of PR is it?
    Bug Fix
    
    ### Todos
    * [x] - restrict setuptools to 65.7.0
    
    ### What is the Jira issue?
    https://issues.apache.org/jira/browse/SUBMARINE-1367
    
    ### How should this be tested?
    NA
    
    ### Screenshots (if appropriate)
    NA
    
    ### Questions:
    * Do the license files need updating? No
    * Are there breaking changes for older versions? No
    * Does this need new documentation? No
    
    Author: cdmikechen <cd...@apache.org>
    
    Signed-off-by: cdmikechen <cd...@apache.org>
    
    Closes #1049 from cdmikechen/SUBMARINE-1367 and squashes the following commits:
    
    7a2d68ce [cdmikechen] restrict version to 65.7.0
---
 dev-support/docker-images/jupyter-gpu/Dockerfile | 1 +
 dev-support/docker-images/jupyter/Dockerfile     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-support/docker-images/jupyter-gpu/Dockerfile b/dev-support/docker-images/jupyter-gpu/Dockerfile
index 27e0d046..18a41934 100644
--- a/dev-support/docker-images/jupyter-gpu/Dockerfile
+++ b/dev-support/docker-images/jupyter-gpu/Dockerfile
@@ -111,6 +111,7 @@ RUN pip --no-cache-dir install pyqlib==0.8.6
 RUN git clone --depth=1 https://github.com/apache/submarine && \
     # replace numpy==1.19.2 to numpy>=1.20.0
     sed -i "s/numpy==1.19.2/numpy>=1.20.0/" submarine/submarine-sdk/pysubmarine/setup.py && \
+    pip --no-cache-dir install setuptools==65.7.0 && \
     pip --no-cache-dir install -e submarine/submarine-sdk/pysubmarine[tf,pytorch] && \
     # Add DeepFM example into notebook
     cp submarine/submarine-sdk/pysubmarine/example/submarine_experiment_sdk.ipynb $HOME && \
diff --git a/dev-support/docker-images/jupyter/Dockerfile b/dev-support/docker-images/jupyter/Dockerfile
index 5587b02b..feb939ee 100644
--- a/dev-support/docker-images/jupyter/Dockerfile
+++ b/dev-support/docker-images/jupyter/Dockerfile
@@ -112,6 +112,7 @@ RUN pip --no-cache-dir install pyqlib==0.8.6
 RUN git clone --depth=1 https://github.com/apache/submarine && \
     # replace numpy==1.19.2 to numpy>=1.20.0
     sed -i "s/numpy==1.19.2/numpy>=1.20.0/" submarine/submarine-sdk/pysubmarine/setup.py && \
+    pip --no-cache-dir install setuptools==65.7.0 && \
     pip --no-cache-dir install submarine/submarine-sdk/pysubmarine[tf,pytorch] && \
     cp submarine/submarine-sdk/pysubmarine/example/submarine_experiment_sdk.ipynb $HOME && \
     cp -r submarine/submarine-sdk/pysubmarine/example/{data,deepfm_example.ipynb,deepfm.json} $HOME && \


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org