Skip to content

Commit

Permalink
remove references to removed files
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryan Paget committed Mar 24, 2024
1 parent debc13b commit 700aa70
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 33 deletions.
13 changes: 0 additions & 13 deletions dockerfiles/jupyterlab/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ RUN wget -q "${VSCODE_URL}" -O ./vscode.deb \
mv $CS_DEFAULT_HOME/* $CS_TEMP_HOME && \
fix-permissions $CS_TEMP_HOME

COPY vscode-overrides.json $CS_TEMP_HOME/Machine/settings.json
# Fix for VSCode extensions and CORS
# Languagepacks.json needs to exist for code-server to recognize the languagepack
COPY languagepacks.json $CS_TEMP_HOME/
Expand Down Expand Up @@ -330,21 +329,9 @@ COPY start-custom.sh /usr/local/bin/
COPY mc-tenant-wrapper.sh /usr/local/bin/mc
COPY trino-wrapper.sh /usr/local/bin/trino

# Add --user to all pip install calls and point pip to Artifactory repository
COPY pip.conf /tmp/pip.conf
RUN cat /tmp/pip.conf >> /etc/pip.conf && rm /tmp/pip.conf \
&& pip config set global.timeout 300

# Point R to Artifactory repository
COPY Rprofile.site /tmp/Rprofile.site
RUN cat /tmp/Rprofile.site >> /opt/conda/lib/R/etc/Rprofile.site && rm /tmp/Rprofile.site

# Add .Rprofile to /tmp so we can install it in start-custom.sh
COPY .Rprofile /tmp/.Rprofile

# Copy over Instructions to Home directory
ADD connect-to-filer.md /home/$NB_USER/connect-to-filer.md

# Point mamba to Artifactory repository
RUN mamba config --add channels http://jfrog-platform-artifactory.jfrog-system:8081/artifactory/api/conda/conda-forge-remote --system && \
mamba config --remove channels conda-forge --system && \
Expand Down
21 changes: 1 addition & 20 deletions dockerfiles/jupyterlab/start-custom.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ else
sleep infinity
fi

test -z "$GIT_EXAMPLE_NOTEBOOKS" || git clone "$GIT_EXAMPLE_NOTEBOOKS"

if [ ! -e /home/$NB_USER/.Rprofile ]; then
cat /tmp/.Rprofile >> /home/$NB_USER/.Rprofile && rm -rf /tmp/.Rprofile
fi

# Configure the shell! If not already configured.
if [ ! -f /home/$NB_USER/.zsh-installed ]; then
if [ -f /tmp/oh-my-zsh-install.sh ]; then
Expand Down Expand Up @@ -120,7 +114,7 @@ export JWT="$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)"
# echo "adding include-system-site-packages"
#fi

echo "Checking for .condarc file in hom directory"
echo "Checking for .condarc file in home directory"
if [[ -f "$HOME/.condarc" ]]; then
echo ".condarc file exists, not going to do anything"
else
Expand All @@ -137,19 +131,6 @@ if [ ! -d "$CS_DEFAULT_HOME/Machine" ]; then
cp -r "$CS_TEMP_HOME/." "$CS_DEFAULT_HOME"
fi

# aaw-dev override settings
if [[ "$KUBERNETES_SERVICE_HOST" =~ ".131." ]]; then
echo "Updating jfrog package config for Dev envrionment"

pip config --user set global.index-url https://jfrog.aaw.cloud.statcan.ca/artifactory/api/pypi/pypi-remote/simple

# remove existing channels in conda system config file
rm /opt/conda/.condarc

conda config --add channels https://jfrog.aaw.cloud.statcan.ca/artifactory/api/conda/conda-forge-remote
conda config --add channels https://jfrog.aaw.cloud.statcan.ca/artifactory/api/conda/conda-forge-nvidia
conda config --add channels https://jfrog.aaw.cloud.statcan.ca/artifactory/api/conda/conda-pytorch-remote
fi

echo "--------------------starting jupyter--------------------"

Expand Down

0 comments on commit 700aa70

Please sign in to comment.