From cfd52c918112c36df4bd7a7cbaf2a21c61f04bc2 Mon Sep 17 00:00:00 2001
From: Holden Karau <holden@pigscanfly.ca>
Date: Mon, 21 Jun 2021 20:41:12 -0700
Subject: [PATCH] Address code review comments from mathbunnyru

---
 Makefile                 | 1 -
 base-notebook/Dockerfile | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index be2833780e..ac072444af 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile
index d6298ca4cc..f7697748ac 100644
--- a/base-notebook/Dockerfile
+++ b/base-notebook/Dockerfile
@@ -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)
@@ -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" && \