Skip to content

Commit e19ee7b

Browse files
committed
Updated workflows + requirements.
1 parent 06e7cf3 commit e19ee7b

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

Dockerfile_singleuser

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ RUN apt-get update && apt-get upgrade -y && dpkg --configure -a && \
8080
apt-get clean -y && \
8181
apt-get install -y \
8282
gnupg \
83-
ssl-cert \
83+
ssl-cert \
8484
libevent-dev \
8585
libsqlite3-dev \
8686
libxml2-dev \
@@ -111,21 +111,22 @@ RUN apt-get update && apt-get upgrade -y && dpkg --configure -a && \
111111
ssh \
112112
jq \
113113
htop \
114-
libglx-mesa0 libegl1 libxrandr2 libxrandr2 libxss1 \
114+
libglx-mesa0 libegl1 libxrandr2 libxss1 \
115115
libxcursor1 libxcomposite1 libasound2-dev libxi6 libxtst6 \
116116
r-base \
117117
libopenblas-dev
118118

119119
# remove newer python version, freeze other versions for max compatibility before updates
120-
RUN apt --fix-missing purge $(dpkg -l | grep 'python3\.1[01]' | awk '{print $2}')
120+
# RUN apt --fix-missing purge $(dpkg -l | grep 'python3\.1[01]' | awk '{print $2}')
121+
122+
121123
RUN apt --fix-broken install
122124
RUN apt-get purge --auto-remove python3.10
123125

124-
# python 3.11
125-
RUN apt-get install -y python3.11-full python3.11-dev python3-pip python3-venv
126-
127-
# be careful, this conflicts
128-
RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1
126+
# Install Python 3.11 system-wide
127+
RUN apt-get update && apt-get install -y python3.11-full python3.11-dev python3.11-venv python3-pip \
128+
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 2 \
129+
&& update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 2
129130

130131
# install remaining packages
131132
RUN apt-get update && apt-get upgrade -y
@@ -142,6 +143,12 @@ RUN apt-get clean autoclean && apt-get autoremove --purge -y
142143

143144
######################################## Python / PIP SECTION ########################################
144145
RUN conda update conda
146+
147+
# Create a Python 3.11 env and make it the default for builds & kernels
148+
RUN conda create -y -n py311 python=3.11 ipykernel && conda clean --all -f -y
149+
ENV CONDA_DEFAULT_ENV=py311
150+
ENV PATH=/opt/conda/envs/py311/bin:$PATH
151+
145152
RUN conda install --quiet --yes \
146153
ipykernel \
147154
pip \
@@ -155,7 +162,7 @@ RUN conda clean --all -f -y
155162
RUN fix-permissions $CONDA_DIR && fix-permissions /home/$NB_USER
156163

157164
# update pip and install basic utilities
158-
RUN pip3 install --no-cache-dir --upgrade pip wheel
165+
RUN pip3 install --no-cache-dir --upgrade pip setuptools wheel
159166

160167
# install the rest of the packages including medcat
161168
COPY ./requirements.txt /srv/jupyterhub/

requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,3 @@ plotly==6.1.1
4545
click==8.2.1
4646
torchvision>=0.20.1
4747
traitlets==5.14.3
48-
eland>=8.12.1
49-
medcat==1.16.0

0 commit comments

Comments
 (0)