From 33e9d3a455beef1b429a71b653c8b9f048485bef Mon Sep 17 00:00:00 2001 From: shane knapp Date: Thu, 16 Nov 2023 14:40:08 -0800 Subject: [PATCH] less means more (images built) --- deployments/a11y/image/apt.txt | 3 +++ deployments/astro/image/apt.txt | 5 ++++- deployments/biology/image/Dockerfile | 2 +- deployments/cee/image/apt.txt | 5 ++++- deployments/data100/image/apt.txt | 3 +++ deployments/data101/image/apt.txt | 3 +++ deployments/data102/image/apt.txt | 3 +++ deployments/data8/image/Dockerfile | 1 + deployments/datahub/images/default/apt.txt | 3 +++ deployments/dev-r/images/default/apt.txt | 2 +- deployments/dev-r/images/secondary/apt.txt | 2 +- deployments/eecs/image/apt.txt | 3 +++ deployments/ischool/image/Dockerfile | 1 + deployments/julia/image/Dockerfile | 2 +- deployments/publichealth/image/Dockerfile | 1 + deployments/shiny/image/Dockerfile | 1 + deployments/stat159/image/apt.txt | 3 +++ deployments/stat20/image/Dockerfile | 1 + 18 files changed, 38 insertions(+), 6 deletions(-) diff --git a/deployments/a11y/image/apt.txt b/deployments/a11y/image/apt.txt index 5add24122..d13c51d1d 100644 --- a/deployments/a11y/image/apt.txt +++ b/deployments/a11y/image/apt.txt @@ -1,6 +1,9 @@ # Some linux packages for basic terminal work, particularly # oriented at users new to Unix/cmd line environments. +# installing less as more just isn't enough +less + # Download tools curl wget diff --git a/deployments/astro/image/apt.txt b/deployments/astro/image/apt.txt index 6cdc06c46..895f0e6c3 100644 --- a/deployments/astro/image/apt.txt +++ b/deployments/astro/image/apt.txt @@ -1,3 +1,6 @@ +# installing less as more just isn't enough +less + # For desktop environment dbus-x11 xfce4 @@ -20,4 +23,4 @@ emacs vim # For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979 -zip \ No newline at end of file +zip diff --git a/deployments/biology/image/Dockerfile b/deployments/biology/image/Dockerfile index 4a3abcc8d..9b9d932e6 100644 --- a/deployments/biology/image/Dockerfile +++ b/deployments/biology/image/Dockerfile @@ -49,8 +49,8 @@ RUN apt-get update -qq --yes && \ # Useful utils that folks sort of take for granted RUN apt-get update -qq --yes && \ apt-get install --yes --no-install-recommends -qq \ - htop \ less \ + htop \ man \ nano \ screen \ diff --git a/deployments/cee/image/apt.txt b/deployments/cee/image/apt.txt index bebcb939e..fdb6e7bd3 100644 --- a/deployments/cee/image/apt.txt +++ b/deployments/cee/image/apt.txt @@ -1,3 +1,6 @@ +# installing less as more just isn't enough +less + # For desktop environment dbus-x11 xfce4 @@ -30,4 +33,4 @@ texlive-lang-chinese libgl1-mesa-glx # For jupyter-tree-download. Ref: https://github.com/berkeley-dsep-infra/datahub/issues/3979 -zip \ No newline at end of file +zip diff --git a/deployments/data100/image/apt.txt b/deployments/data100/image/apt.txt index bfc2a1031..a6c4589ed 100644 --- a/deployments/data100/image/apt.txt +++ b/deployments/data100/image/apt.txt @@ -1,6 +1,9 @@ # Some linux packages for basic terminal work, particularly # oriented at users new to Unix/cmd line environments. +# installing less as more just isn't enough +less + # Basic unix tools man man-db diff --git a/deployments/data101/image/apt.txt b/deployments/data101/image/apt.txt index 47b06c60a..b78191883 100644 --- a/deployments/data101/image/apt.txt +++ b/deployments/data101/image/apt.txt @@ -1,6 +1,9 @@ # Some linux packages for basic terminal work, particularly # oriented at users new to Unix/cmd line environments. +# installing less as more just isn't enough +less + # Basic unix tools man man-db diff --git a/deployments/data102/image/apt.txt b/deployments/data102/image/apt.txt index 9fe911710..2aa86a867 100644 --- a/deployments/data102/image/apt.txt +++ b/deployments/data102/image/apt.txt @@ -1,6 +1,9 @@ # Some linux packages for basic terminal work, particularly # oriented at users new to Unix/cmd line environments. +# installing less as more just isn't enough +less + # Basic unix tools man man-db diff --git a/deployments/data8/image/Dockerfile b/deployments/data8/image/Dockerfile index d28f05b82..e72e423d4 100644 --- a/deployments/data8/image/Dockerfile +++ b/deployments/data8/image/Dockerfile @@ -22,6 +22,7 @@ RUN install -d -o ${NB_USER} -g ${NB_USER} ${R_LIBS_USER} RUN apt-get -qq update --yes && \ apt-get -qq install --yes \ + less \ tar \ vim \ micro \ diff --git a/deployments/datahub/images/default/apt.txt b/deployments/datahub/images/default/apt.txt index 5d0ac6ed8..3be44e9e5 100644 --- a/deployments/datahub/images/default/apt.txt +++ b/deployments/datahub/images/default/apt.txt @@ -1,3 +1,6 @@ +# installing less as more just isn't enough +less + tar vim micro diff --git a/deployments/dev-r/images/default/apt.txt b/deployments/dev-r/images/default/apt.txt index da9f3e4e1..5682ae796 100644 --- a/deployments/dev-r/images/default/apt.txt +++ b/deployments/dev-r/images/default/apt.txt @@ -3,8 +3,8 @@ tini # useful utilities tar -vim less +vim # for nbconvert, knitr, etc. texlive-xetex diff --git a/deployments/dev-r/images/secondary/apt.txt b/deployments/dev-r/images/secondary/apt.txt index 8255c492f..86941ae7d 100644 --- a/deployments/dev-r/images/secondary/apt.txt +++ b/deployments/dev-r/images/secondary/apt.txt @@ -1,7 +1,7 @@ # useful utilities tar -vim less +vim # for nbconvert, knitr, etc. texlive-xetex diff --git a/deployments/eecs/image/apt.txt b/deployments/eecs/image/apt.txt index 0f29f01a1..56c697992 100644 --- a/deployments/eecs/image/apt.txt +++ b/deployments/eecs/image/apt.txt @@ -1,3 +1,6 @@ +# installing less as more just isn't enough +less + # For desktop environment dbus-x11 xfce4 diff --git a/deployments/ischool/image/Dockerfile b/deployments/ischool/image/Dockerfile index 550399533..77541e582 100644 --- a/deployments/ischool/image/Dockerfile +++ b/deployments/ischool/image/Dockerfile @@ -23,6 +23,7 @@ WORKDIR ${HOME} # libarchive-dev for https://github.com/berkeley-dsep-infra/datahub/issues/1997 RUN apt-get update > /dev/null && \ apt-get install --yes \ + less \ fonts-symbola \ libx11-xcb1 \ libxtst6 \ diff --git a/deployments/julia/image/Dockerfile b/deployments/julia/image/Dockerfile index d6a669aca..a64c5f07b 100644 --- a/deployments/julia/image/Dockerfile +++ b/deployments/julia/image/Dockerfile @@ -21,8 +21,8 @@ RUN adduser --disabled-password --gecos "Default Jupyter user" ${NB_USER} # Useful utils that folks sort of take for granted RUN apt-get update -qq --yes && \ apt-get install --yes -qq \ - htop \ less \ + htop \ man \ nano \ screen \ diff --git a/deployments/publichealth/image/Dockerfile b/deployments/publichealth/image/Dockerfile index 05ad03c07..1ef7954b9 100644 --- a/deployments/publichealth/image/Dockerfile +++ b/deployments/publichealth/image/Dockerfile @@ -27,6 +27,7 @@ WORKDIR ${HOME} # tini is necessary because it is our ENTRYPOINT below. RUN apt-get update > /dev/null && \ apt-get install --yes \ + less \ libx11-xcb1 \ libxtst6 \ libxrandr2 \ diff --git a/deployments/shiny/image/Dockerfile b/deployments/shiny/image/Dockerfile index e3bef4e48..bedcc1210 100644 --- a/deployments/shiny/image/Dockerfile +++ b/deployments/shiny/image/Dockerfile @@ -30,6 +30,7 @@ WORKDIR ${HOME} # and we don't want them to be downloaded on demand by students. RUN apt-get update && \ apt-get install --yes \ + less \ libx11-xcb1 \ libxtst6 \ libxrandr2 \ diff --git a/deployments/stat159/image/apt.txt b/deployments/stat159/image/apt.txt index 1b51ebd50..96646f693 100644 --- a/deployments/stat159/image/apt.txt +++ b/deployments/stat159/image/apt.txt @@ -1,6 +1,9 @@ # Some linux packages for basic terminal work, particularly # oriented at users new to Unix/cmd line environments. +# installing less as more just isn't enough +less + # Basic unix tools man man-db diff --git a/deployments/stat20/image/Dockerfile b/deployments/stat20/image/Dockerfile index b6f100b40..85fc27c35 100644 --- a/deployments/stat20/image/Dockerfile +++ b/deployments/stat20/image/Dockerfile @@ -29,6 +29,7 @@ WORKDIR ${HOME} # tini is necessary because it is our ENTRYPOINT below. RUN apt-get update && \ apt-get -qq install \ + less \ tini \ fonts-symbola \ pandoc \