Skip to content

Commit

Permalink
Address code review comments from mathbunnyru
Browse files Browse the repository at this point in the history
  • Loading branch information
holdenk committed Jun 22, 2021
1 parent b41e2e4 commit cfd52c9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

# Use bash for inline if-statements in arch_patch target
SHELL:=bash
ARCH:=$(shell uname -m)
OWNER?=jupyter

# Need to list the images in build dependency order
Expand Down
8 changes: 4 additions & 4 deletions base-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ ARG miniforge_python="Mambaforge"
# Miniforge archive to install
ARG miniforge_version="${conda_version}-${miniforge_patch_number}"
# Miniforge installer
RUN export arch=$(uname -m) && \
RUN export miniforge_arch=$(uname -m) && \
if [ "$arch" == "aarm64" ]; then \
arch="arm64"; \
miniforge_arch="arm64"; \
fi; \
RUN export miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${arch}.sh"
RUN export miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh"

# Install all OS dependencies for notebook server that starts but lacks all
# features (e.g., download as all possible file formats)
Expand Down Expand Up @@ -104,7 +104,7 @@ WORKDIR /tmp

# Prerequisites installation: conda, mamba, pip, tini
RUN wget --quiet "https://github.com/conda-forge/miniforge/releases/download/${miniforge_version}/${miniforge_installer}" && \
/bin/bash "${miniforge_installer}" -f -b -p ${CONDA_DIR} && \
/bin/bash "${miniforge_installer}" -f -b -p "${CONDA_DIR}" && \
rm "${miniforge_installer}" && \
# Conda configuration see https://conda.io/projects/conda/en/latest/configuration.html
echo "conda ${CONDA_VERSION}" >> "${CONDA_DIR}/conda-meta/pinned" && \
Expand Down

0 comments on commit cfd52c9

Please sign in to comment.