Skip to content

Commit 2cd5a9a

Browse files
committed
Remove node, npm packages, and WeasyPrint pins
Removed node, vega npm packages, and WeasyPrint pinned fixes. Due to removing node, the Dockerfile can now be built on ARM machines.
1 parent 40a538e commit 2cd5a9a

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

Dockerfile

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
3838
&& apt-get clean \
3939
&& rm -rf /var/lib/apt/lists/*
4040

41-
# Install Node and vega-cli for server-side image rendering
42-
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
43-
RUN apt-get -y install nodejs
44-
RUN npm install -g --unsafe-perm vega-cli@5.13.0 vega-lite@4.13.0 canvas@2.6.1
45-
4641
RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \
4742
locale-gen
4843

@@ -62,9 +57,6 @@ ENV LANG en_US.UTF-8
6257
ENV LANGUAGE en_US.UTF-8
6358
ENV PATH $HOME/.local/bin:$PATH
6459

65-
# Disable npm package update notifications (DEV-4202)
66-
ENV NO_UPDATE_NOTIFIER=1
67-
6860
# Create jovyan user with UID=1000 and in the root group
6961
# See https://github.com/jupyter/docker-stacks/issues/188
7062
RUN useradd -m -s /bin/bash -N -u $NB_UID -g 0 $NB_USER
@@ -140,12 +132,5 @@ ENV PYTHONPATH "/home/jovyan/.local/lib/python3.9"
140132
# Provide full access to the Python directory to allow for pip installs
141133
RUN chown -R $NB_USER:root /usr/local/lib/python3.9
142134

143-
# Fix for transparency issue
144-
# Pin in onecodex/onecodex once version w/ fix is released
145-
# https://github.com/Kozea/WeasyPrint/commit/4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef
146-
RUN pip install --force-reinstall 'git+https://github.com/Kozea/WeasyPrint.git@4dfe6079c2d1bd91cccfd9a7d78f8924e2dfabef'
147-
148-
RUN pip install --force-reinstall 'git+https://github.com/CourtBouillon/pydyf.git@f340fcc949382e183118b4807491b9f5cab4a89b'
149-
150135
# Switch to unprivileged user, jovyan
151136
USER $NB_USER

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nbconvert==6.5.0
88
openpyxl==3.0.3
99
xlrd==1.2.0
1010
statsmodels==0.13.2
11-
onecodex[all,reports]==0.16.0
12-
traitlets==5.9.0
11+
#onecodex[all,reports]==0.16.0
12+
onecodex[all,reports] @ https://github.com/onecodex/onecodex/archive/d05f0d785d9d22fdc50b6c8f254d8daaaecb4f62.zip
1313
taxonomy==0.10.0
1414
widgetsnbextension

0 commit comments

Comments
 (0)