Revert "Adding missing noninteractive env variable"

This reverts commit ca0aaa4.
cityofcapetown · Oct 3, 2024 · 2b871bc · 2b871bc
1 parent ca0aaa4
commit 2b871bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/base/drivers/python_minimal/r/Dockerfile b/base/drivers/python_minimal/r/Dockerfile
@@ -24,7 +24,7 @@ COPY install.R .
 # Do the build in one layer to keep the image as small as possible.
 # temporary symlink to fix broken apt_inst and apt_pkg for gdebi and add-apt-repository
 # remove when the python 3.9 dependencies are removed from python_minimal
-RUN DEBIAN_FRONTEND=noninteractive ln -s /usr/lib/python3/dist-packages/apt_pkg.cpython-310-x86_64-linux-gnu.so /usr/lib/python3/dist-packages/apt_pkg.so \
+RUN  ln -s /usr/lib/python3/dist-packages/apt_pkg.cpython-310-x86_64-linux-gnu.so /usr/lib/python3/dist-packages/apt_pkg.so \
   && ln -s /usr/lib/python3/dist-packages/apt_inst.cpython-310-x86_64-linux-gnu.so /usr/lib/python3/dist-packages/apt_inst.so \
 # Install common utils
   && apt-get install -y --no-install-recommends \
@@ -41,7 +41,7 @@ RUN DEBIAN_FRONTEND=noninteractive ln -s /usr/lib/python3/dist-packages/apt_pkg.
     build-essential \
     sudo \
  && wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc \
- && add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" \
+ && sudo add-apt-repository "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" \
  && apt-get update \
  && apt-get install -y --no-install-recommends r-base r-base-dev \
 # Install system dependencies for common R packages
@@ -57,7 +57,7 @@ RUN DEBIAN_FRONTEND=noninteractive ln -s /usr/lib/python3/dist-packages/apt_pkg.
 # Makes use of pak to install system dependencies of CRAN top 100 packages as well
 # Use install.R to determine what apt packages are needed...
     && if [ -f install.R ]; then R --quiet -f install.R; fi \
-# ...install.R will create a bash install file called R_apt_deps.sh...
+# ...install.R will create a bash install file called R_apt_deps.txt...
 # ...and then use apt to install those packages
  && echo "Checking for 'R_apt_deps.'..." \
         ; if test -f "R_apt_deps.sh" ; then \

diff --git a/base/drivers/python_minimal/r/rstudio/Dockerfile b/base/drivers/python_minimal/r/rstudio/Dockerfile
@@ -4,7 +4,7 @@ USER root
 
 # Install system dependencies ==================================================
 # BOTH JUPYTER AND RSTUDIO DEPS ================================================
-RUN DEBIAN_FRONTEND=noninteractive apt-get update --fix-missing > /dev/null \
+RUN apt-get update --fix-missing > /dev/null \
  && apt-get install --yes --no-install-recommends \
     # for jupyter
     git \