-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor(Jupyterlab): Clean-up (#544)
* refactor(docker): clean up #1 * feat(CI): build on push * fix(kubeflow): mamba no cache * fix(kubectl): update kubectl * chore(dockerfiles): update output * refactor(kubeflow): remove deprecated python SDKs * refactor(kubeflow): update PyYAML * refactor(kubeflow): remove notebook, comes from upstream * refactor(kubeflow): replace s3fs fork with upstream * refactor(kubeflow): remove upstream utils * refactor(kubeflow): add kubeflow training py sdk * chore(dockerfiles): update output * refactor(kubeflow): use pip for kf-training * fix(remote-desktop): include minimamba * fix(remote-desktop): update condarc * fix(remote-desktop): remove prelim condarc * chore(dockerfiles): update output * fix(remote-desktop): add conda forge channel * fix(remote-desktop): add init condarc * fix(remote-desktop): add init condarc * fix(remote-desktop): fix typo * feat(docker): enable buildkit * fix(odbcdrives): remove alien and unixodbc (available upstream) * refactor(jupylab): concat pip/mamba install * refactor(jupylab): update pinned extension * fix(jupyterlab): labextension deprecated * refactor(clean-layer): restructure script call * fix(makefile): re-disable buildkit...? * refactor(layer-cache): add clean-layer.sh to all conda/mamba/npm runs * fix(sqlite): update apt archive pre-install * fix(cve): unpin yaml-language-server * fix(cve): remove audit fix * feat(jupyterlab): add graphviz and try to patch babel * fix(graphviz): add to test_packages exclusion * fix(cve): update openmpp UI * fix(cve): update ompp checksum * fix(cve): force babel/traverse installation * fix(CI): update tests and workflow * fix(ci): Update build_push.yaml to match master * fix(CI): remove `name` * fix(CI): get notebook name * fix(CI): remove languageserver already installed * fix(CI): reset workflow file
- Loading branch information
1 parent
0c7be81
commit 23a315d
Showing
31 changed files
with
540 additions
and
581 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,6 @@ __pycache__ | |
.venv | ||
.ipynb_checkpoints/ | ||
.idea | ||
node_modules | ||
package-lock.json | ||
package.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,9 @@ | ||
# Install Tensorflow | ||
RUN pip install --quiet \ | ||
'tensorflow' \ | ||
'keras' \ | ||
'ipykernel==6.21.3' \ | ||
RUN mamba install --quiet --yes \ | ||
tensorflow \ | ||
keras \ | ||
ipykernel \ | ||
&& \ | ||
clean-layer.sh && \ | ||
fix-permissions $CONDA_DIR && \ | ||
fix-permissions /home/$NB_USER |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,17 @@ | ||
USER root | ||
COPY aaw-suspend-server.sh /usr/local/bin | ||
|
||
# https://github.com/StatCan/aaw-kubeflow-containers/issues/293 | ||
RUN pip3 --no-cache-dir install --quiet \ | ||
'Pillow==9.4.0' \ | ||
'notebook==6.5.3' \ | ||
'PyYAML==6.0' \ | ||
'jupyterlab==3.6.1' && \ | ||
fix-permissions $CONDA_DIR && \ | ||
fix-permissions /home/$NB_USER | ||
|
||
RUN pip3 --no-cache-dir install --quiet \ | ||
'kubeflow-pytorchjob==0.1.3' \ | ||
'kubeflow-tfjob==0.1.3' \ | ||
'minio==7.1.13' \ | ||
RUN mamba install --quiet \ | ||
'pillow' \ | ||
'pyyaml' \ | ||
'joblib==1.2.0' \ | ||
'git+https://github.com/zachomedia/s3fs@8aa929f78666ff9e323cde7d9be9262db5a17985' && \ | ||
# s3 file system tool forked by Zach, ~4 years old, to be upgraded | ||
's3fs' \ | ||
'fire==0.5.0' \ | ||
'graphviz' && \ | ||
pip install 'kubeflow-training' && \ | ||
clean-layer.sh && \ | ||
fix-permissions $CONDA_DIR && \ | ||
fix-permissions /home/$NB_USER | ||
|
||
RUN pip3 --no-cache-dir install --quiet \ | ||
'fire==0.5.0' && \ | ||
fix-permissions $CONDA_DIR && \ | ||
fix-permissions /home/$NB_USER | ||
|
||
COPY aaw-suspend-server.sh /usr/local/bin | ||
RUN chmod +x /usr/local/bin/aaw-suspend-server.sh | ||
fix-permissions /home/$NB_USER && \ | ||
chmod +x /usr/local/bin/aaw-suspend-server.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
# ODBC drivers | ||
RUN apt-get update && \ | ||
apt-get install -y alien unixodbc unixodbc-dev && \ | ||
pip install --no-cache-dir --quiet 'pyodbc==4.0.35' && \ | ||
apt-get install -y unixodbc-dev && \ | ||
pip install --no-cache-dir --quiet pyodbc && \ | ||
rm -rf /var/lib/apt/lists/* && \ | ||
fix-permissions $CONDA_DIR && \ | ||
fix-permissions /home/$NB_USER |
Oops, something went wrong.