Skip to content

Commit

Permalink
Add a build arg to disable NodeJS
Browse files Browse the repository at this point in the history
  • Loading branch information
matyasselmeci committed Nov 4, 2022
1 parent 502f24e commit 17a027a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ FROM python:${PYTHON_VERSION}
# build config
ARG HTCONDOR_VERSION=9.0

ARG DISABLE_NODEJS=

# switch to root to do root-level config
USER root

Expand Down Expand Up @@ -68,7 +70,7 @@ RUN : \
fi \
&& python -m pip install --user --no-cache-dir --disable-pip-version-check "/home/${USER}/htmap[tests,docs,widgets]" "$requirement" \
&& jupyter nbextension enable --py widgetsnbextension \
&& jupyter labextension install --minimize=False @jupyter-widgets/jupyterlab-manager \
&& [ "X${DISABLE_NODEJS}" != X ] || jupyter labextension install --minimize=False @jupyter-widgets/jupyterlab-manager \
&& :

WORKDIR /home/${USER}/htmap
5 changes: 4 additions & 1 deletion docker/install-htcondor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ fi
export DEBIAN_FRONTEND=noninteractive

apt-get update
apt-get -y install --no-install-recommends vim less git gnupg wget ca-certificates locales graphviz pandoc strace nodejs npm
apt-get -y install --no-install-recommends vim less git gnupg wget ca-certificates locales graphviz pandoc strace
if [[ ! $DISABLE_NODEJS ]]; then
apt-get -y install --no-install-recommends nodejs npm
fi
echo "en_US.UTF-8 UTF-8" > /etc/locale.gen
locale-gen
wget -qO - "https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-${HTCONDOR_VERSION}-Key" | apt-key add -
Expand Down

0 comments on commit 17a027a

Please sign in to comment.