From c2bf57db076d94874fdb9f979ddf6f6dbe64fe34 Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
Date: Wed, 7 Aug 2024 15:45:14 +0000
Subject: [PATCH] Remove IMAGE.md Add nbstripout Add R back

Signed-off-by: GitHub <noreply@github.com>
---
 Dockerfile | 52 ++++++++++++----------------------------------------
 IMAGE.md   | 28 ----------------------------
 2 files changed, 12 insertions(+), 68 deletions(-)
 delete mode 100644 IMAGE.md

diff --git a/Dockerfile b/Dockerfile
index e2b2b4d..fae0387 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -116,53 +116,25 @@ rm --force --recursive /var/lib/apt/lists/* node.sh
 EOF
 
 # R
-# RUN <<EOF
-# curl --location --fail-with-body \
-#   "https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc" \
-#   --output "marutter_pubkey.asc"
-
-# cat marutter_pubkey.asc | gpg --dearmor --output marutter_pubkey.gpg
-
-# install -D --owner root --group root --mode 644 marutter_pubkey.gpg /etc/apt/keyrings/marutter_pubkey.gpg
-
-# echo "deb [signed-by=/etc/apt/keyrings/marutter_pubkey.gpg] https://cloud.r-project.org/bin/linux/ubuntu noble-cran40/" > /etc/apt/sources.list.d/cran.list
-
-# apt-get update --yes
-
-# apt-get install --yes "r-base=${R_VERSION}"
-
-# apt-get clean --yes
-
-# rm --force --recursive marutter_pubkey.asc marutter_pubkey.gpg /var/lib/apt/lists/*
-# EOF
-
-# # BASE NOTEBOOK
-# RUN <<EOF
-# apt-get update --yes
+RUN <<EOF
+curl --location --fail-with-body \
+  "https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc" \
+  --output "marutter_pubkey.asc"
 
-# apt-get install --yes \
-#   "fonts-liberation=1:2.1.5-3" \
-#   "pandoc=3.1.3+ds-2"
+cat marutter_pubkey.asc | gpg --dearmor --output marutter_pubkey.gpg
 
-# apt-get clean --yes
+install -D --owner root --group root --mode 644 marutter_pubkey.gpg /etc/apt/keyrings/marutter_pubkey.gpg
 
-# rm --force --recursive /var/lib/apt/lists/*
-# EOF
+echo "deb [signed-by=/etc/apt/keyrings/marutter_pubkey.gpg] https://cloud.r-project.org/bin/linux/ubuntu noble-cran40/" > /etc/apt/sources.list.d/cran.list
 
-# # MINIMAL NOTEBOOK
-# RUN <<EOF
-# apt-get update --yes
+apt-get update --yes
 
-# apt-get install --yes \
-#   "less=590-2ubuntu2.1" \
-#   "texlive-xetex=2023.20240207-1" \
-#   "texlive-fonts-recommended=2023.20240207-1" \
-#   "texlive-plain-generic=2023.20240207-1"
+apt-get install --yes "r-base=${R_VERSION}"
 
-# apt-get clean --yes
+apt-get clean --yes
 
-# rm --force --recursive /var/lib/apt/lists/*
-# EOF
+rm --force --recursive marutter_pubkey.asc marutter_pubkey.gpg /var/lib/apt/lists/*
+EOF
 
 USER ${CONTAINER_USER}
 WORKDIR /home/${CONTAINER_USER}
diff --git a/IMAGE.md b/IMAGE.md
deleted file mode 100644
index 8f0d64a..0000000
--- a/IMAGE.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# Jupyter Image Hierarchy
-
-# Data Science Notebook
-
-datascience-notebook
-  scipy-notebook
-    minimal-notebook
-      base-notebook
-        docker-stacks-foundation
-
-# All Spark Notebook
-
-all-spark-notebook
-  pyspark-notebook
-    scipy-notebook
-      minimal-notebook
-        base-notebook
-          docker-stacks-foundation
-
-docker-stacks-foundation: YES
-base-notebook: YES
-minimal-notebook: NO
-scipy-notebook: NO
-datascience-notebook: NO
-pyspark-notebook: NO
-all-spark-notebook: NO
-mojap-datascience-notebook: NO
-mojap-all-spark-notebook: NO