Skip to content

Commit 8a30735

Browse files
update docker setup - fixes for ARM M1 chip
1 parent 2c8c485 commit 8a30735

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

docker/Dockerfile

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jupyter/minimal-notebook:lab-3.1.4
1+
FROM jupyter/minimal-notebook:lab-3.1.18
22

33
USER root
44

@@ -35,26 +35,36 @@ USER ${NB_USER}
3535
RUN pip install \
3636
'jupyterlab_iframe==0.4.0' \
3737
'git+https://github.com/stv0g/nbgitpuller@f735265f7b2a429a17a8fab70cfd3557f060640d' \
38-
'rwth-nb==0.1.8'
38+
'rwth-nb==0.1.8' \
39+
'tqdm'
3940

4041
RUN conda install --name base --no-update-deps \
4142
'conda==4.10.3' && \
4243
conda install --name base --quiet --yes --no-update-deps \
4344
'jupyterlab-git==0.32.1' \
4445
'ujson==4.0.2' \
45-
'ipywidgets==7.6.3' \
46-
'ipympl==0.7.0' \
46+
'ipympl==0.9.3' \
4747
'matplotlib-base==3.4.3' && \
4848
conda clean --all
4949

5050

5151
RUN conda install --name base --quiet --yes --no-update-deps \
52-
'jupyterlab_widgets' \
5352
'jupyterlab-drawio==0.9.0' \
5453
'jupyterlab_iframe==0.4.0' \
55-
'jupyterlab_latex=3.0.0' && \
54+
'jupyterlab_latex=3.0.0' \
55+
'jupyter_core==4.11.2' && \
5656
conda clean --all
5757

58+
RUN conda install --name base --quiet --yes --no-update-deps --channel conda-forge \
59+
'jupyterlab_widgets' \
60+
'jupyterhub=1.1.0' \
61+
'ipywidgets' && \
62+
conda clean --all
63+
64+
# Fix traitlets pip package
65+
RUN pip uninstall -y traitlets
66+
RUN pip install traitlets==5.9.0
67+
5868
# Workaround LaTex
5969
RUN git clone https://github.com/joequant/jupyterlab-latex /tmp/jupyterlab-latex && cd /tmp/jupyterlab-latex && git checkout cbb66825786ecf11a35fd92df797f8ccee719ad4 && pip install -ve .
6070
RUN jupyter lab build
@@ -152,9 +162,9 @@ USER jovyan
152162
ARG TARGETPLATFORM
153163

154164
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
155-
pip install tensorflow-gpu==2.10.0 ; \
165+
pip install tensorflow==2.10.0 ; \
156166
elif [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
157-
python -m pip install tensorflow-macos ; \
167+
pip install tensorflow==2.10.0 ; \
158168
fi
159169

160170
# Install packages via requirements.txt
@@ -167,25 +177,18 @@ RUN jupyter labextension install jupyterlab-plotly
167177
# Install PointPillars Package
168178
RUN pip install git+https://github.com/ika-rwth-aachen/PointPillars.git
169179

170-
# Install TensorBoard Widget
171-
RUN pip install git+https://github.com/cliffwoolley/jupyter_tensorboard.git
172-
RUN pip install git+https://github.com/chaoleili/jupyterlab_tensorboard.git
173-
RUN jupyter tensorboard enable --user
174-
175180
# Install Jupyros
176-
RUN pip install service_identity --force --upgrade
177-
RUN pip install jupyter bqplot pyyaml ipywidgets ipycanvas
178-
RUN pip install jupyros
181+
RUN conda install jupyter bqplot pyyaml ipywidgets ipycanvas
182+
RUN pip install jupyros==0.7.0a0
179183
RUN pip install roslibpy
180184
RUN pip install pyrosbag
181185

182186
# install the zethus and urdf libraries
183187
RUN pip install pyOpenSSL --upgrade
184188
RUN pip install pymongo
185189

186-
RUN pip install jupyterlab-urdf
190+
RUN pip install jupyterlab-urdf==0.2.1
187191
RUN pip install jupyterlab-zethus
188192

189-
RUN jupyter nbextension install --py --symlink --sys-prefix jupyros
190-
RUN jupyter nbextension enable --py --sys-prefix jupyros
191-
RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
193+
ENV ROS_HOSTNAME=localhost
194+
ENV ROS_MASTER_URI=http://localhost:11311

docker/requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
tensorflow-addons
2-
tensorflow-datasets
1+
tensorflow-datasets==4.9.2
32
matplotlib
43
jupyter
54
scikit-learn
6-
tensorflow_probability==0.13.0
5+
tensorflow_probability==0.18.0
76
beeprint
87
cmake
98
opencv-python

0 commit comments

Comments
 (0)