Skip to content

Commit c1f6955

Browse files
committed
Use jupyter-matlab-proxy from PyPi and 21a deps
1 parent 0207ebc commit c1f6955

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

matlab/Dockerfile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ RUN ln -s /usr/local/MATLAB/bin/matlab /usr/local/bin/matlab
3535

3636
# Install MATLAB dependencies
3737
# Reference: https://github.com/mathworks-ref-arch/container-images/tree/master/matlab-deps
38+
# The following are the dependencies for R2021a
3839
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install --no-install-recommends -y \
40+
ca-certificates \
3941
libasound2 \
4042
libatk1.0-0 \
4143
libc6 \
@@ -51,6 +53,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
5153
libgtk-3-0 \
5254
libnspr4 \
5355
libnss3 \
56+
libodbc1 \
5457
libpam0g \
5558
libpango-1.0-0 \
5659
libpangocairo-1.0-0 \
@@ -60,7 +63,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
6063
libselinux1 \
6164
libsm6 \
6265
libsndfile1 \
63-
libtcl8.6 \
6466
libuuid1 \
6567
libx11-6 \
6668
libx11-xcb1 \
@@ -78,12 +80,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
7880
libxt6 \
7981
libxtst6 \
8082
libxxf86vm1 \
81-
zlib1g \
82-
xkb-data \
83+
locales \
84+
locales-all \
85+
make \
86+
net-tools \
8387
procps \
84-
ca-certificates \
8588
sudo \
86-
locales locales-all \
89+
tzdata \
90+
unzip \
91+
zlib1g \
8792
&& apt-get clean \
8893
&& apt-get -y autoremove \
8994
&& rm -rf /var/lib/apt/lists/*
@@ -98,7 +103,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
98103
USER $NB_USER
99104

100105
# Install integration
101-
RUN python -m pip install https://github.com/mathworks/jupyter-matlab-proxy/archive/v0.2.0.tar.gz
106+
RUN python -m pip install jupyter-matlab-proxy
102107

103108
# Ensure jupyter-server-proxy JupyterLab extension is installed
104109
RUN jupyter labextension install @jupyterlab/server-proxy

matlab/Dockerfile.mounted

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ RUN ln -s /usr/local/MATLAB/bin/matlab /usr/local/bin/matlab
1010

1111
# Install MATLAB dependencies
1212
# Reference: https://github.com/mathworks-ref-arch/container-images/tree/master/matlab-deps
13+
# The following are the dependencies for R2021a
1314
RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install --no-install-recommends -y \
15+
ca-certificates \
1416
libasound2 \
1517
libatk1.0-0 \
1618
libc6 \
@@ -26,6 +28,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
2628
libgtk-3-0 \
2729
libnspr4 \
2830
libnss3 \
31+
libodbc1 \
2932
libpam0g \
3033
libpango-1.0-0 \
3134
libpangocairo-1.0-0 \
@@ -35,7 +38,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
3538
libselinux1 \
3639
libsm6 \
3740
libsndfile1 \
38-
libtcl8.6 \
3941
libuuid1 \
4042
libx11-6 \
4143
libx11-xcb1 \
@@ -53,12 +55,15 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
5355
libxt6 \
5456
libxtst6 \
5557
libxxf86vm1 \
56-
zlib1g \
57-
xkb-data \
58+
locales \
59+
locales-all \
60+
make \
61+
net-tools \
5862
procps \
59-
ca-certificates \
6063
sudo \
61-
locales locales-all \
64+
tzdata \
65+
unzip \
66+
zlib1g \
6267
&& apt-get clean \
6368
&& apt-get -y autoremove \
6469
&& rm -rf /var/lib/apt/lists/*
@@ -73,7 +78,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -
7378
USER $NB_USER
7479

7580
# Install integration
76-
RUN python -m pip install https://github.com/mathworks/jupyter-matlab-proxy/archive/v0.2.0.tar.gz
81+
RUN python -m pip install jupyter-matlab-proxy
7782

7883
# Ensure jupyter-server-proxy JupyterLab extension is installed
7984
RUN jupyter labextension install @jupyterlab/server-proxy

0 commit comments

Comments
 (0)