From 9aa624f00826599964e09972e3d51cbfb35ef01c Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@justice.gov.uk>
Date: Mon, 4 Nov 2024 09:24:05 +0000
Subject: [PATCH 1/3] Add Vim

Signed-off-by: Jacob Woffenden <jacob.woffenden@justice.gov.uk>
---
 Dockerfile                        | 1 +
 test/container-structure-test.yml | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 12b17fa..fbcd797 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,6 +70,7 @@ apt-get install --yes \
   "less=590-2ubuntu2.1" \
   "python3.12=3.12.3-1ubuntu0.2" \
   "python3-pip=24.0+dfsg-1ubuntu1" \
+  "vim=2:9.1.0016-1ubuntu7.3" \
   "unzip=6.0-28ubuntu4.1"
 
 apt-get clean --yes
diff --git a/test/container-structure-test.yml b/test/container-structure-test.yml
index 2eb3870..09a24ae 100644
--- a/test/container-structure-test.yml
+++ b/test/container-structure-test.yml
@@ -104,6 +104,11 @@ commandTests:
     args: ["--skip-version-check", "version"]
     expectedOutput: ["1.37.5"]
 
+  - name: "vim"
+    command: "vim"
+    args: ["--version"]
+    expectedOutput: ["VIM - Vi IMproved 9.1"]
+
 fileExistenceTests:
   - name: "/opt/analytical-platform"
     path: "/opt/analytical-platform"

From 2a8f33aa044b615e75064241c1553646a88c7200 Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@justice.gov.uk>
Date: Mon, 4 Nov 2024 09:29:44 +0000
Subject: [PATCH 2/3] Bump R

Signed-off-by: Jacob Woffenden <jacob.woffenden@justice.gov.uk>
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fbcd797..915f900 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ ENV CONTAINER_USER="analyticalplatform" \
     NODE_LTS_VERSION="20.18.0" \
     CORRETTO_VERSION="1:21.0.5.11-1" \
     DOTNET_SDK_VERSION="8.0.110-0ubuntu1~24.04.1" \
-    R_VERSION="4.4.1-3.2404.0" \
+    R_VERSION="4.4.2-1.2404.0" \
     OLLAMA_VERSION="0.3.14" \
     KUBECTL_VERSION="1.29.9" \
     HELM_VERSION="3.16.2" \

From 1a1c41c5d3fc22ae3277e17b3d2005f1ec969d6c Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@justice.gov.uk>
Date: Mon, 4 Nov 2024 09:37:58 +0000
Subject: [PATCH 3/3] live by the sword and all that eh

Signed-off-by: Jacob Woffenden <jacob.woffenden@justice.gov.uk>
---
 test/container-structure-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/container-structure-test.yml b/test/container-structure-test.yml
index 09a24ae..e9f3df2 100644
--- a/test/container-structure-test.yml
+++ b/test/container-structure-test.yml
@@ -82,7 +82,7 @@ commandTests:
   - name: "r"
     command: "R"
     args: ["--version"]
-    expectedOutput: ["R version 4.4.1"]
+    expectedOutput: ["R version 4.4.2"]
 
   - name: "ollama"
     command: "ollama"