From 1760405537ac0a0f1d8a3ef38c4a71690f1d432d Mon Sep 17 00:00:00 2001
From: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
Date: Wed, 25 Sep 2024 11:50:44 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=8C=20Patching=20(#60)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jacob Woffenden <jacob.woffenden@digital.justice.gov.uk>
---
 .github/workflows/super-linter.yml |  1 +
 Dockerfile                         | 18 +++++++++---------
 chart/Chart.yaml                   |  4 ++--
 chart/values.yaml                  |  2 +-
 test/container-structure-test.yml  |  6 +++---
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
index 696a7c9..c773060 100644
--- a/.github/workflows/super-linter.yml
+++ b/.github/workflows/super-linter.yml
@@ -32,4 +32,5 @@ jobs:
         uses: super-linter/super-linter/slim@b92721f792f381cedc002ecdbb9847a15ece5bb8 # v7.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          VALIDATE_CHECKOV: false # Disabling while in discovery
           VALIDATE_KUBERNETES_KUBECONFORM: false # Super-Linter doesn't support https://github.com/jtyr/kubeconform-helm
diff --git a/Dockerfile b/Dockerfile
index bef572d..f12adbe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/ubuntu/ubuntu@sha256:288b44a1b2dfe3788255c3abd41e346bece153b9e066325f461f605425afaf82
+FROM public.ecr.aws/ubuntu/ubuntu@sha256:5b2fc4131b3c134a019c3ea815811de70e6ad9ee1626f59bf302558a95b436e5
 
 LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.authors="Analytical Platform (analytical-platform@digital.justice.gov.uk)" \
@@ -7,19 +7,20 @@ LABEL org.opencontainers.image.vendor="Ministry of Justice" \
       org.opencontainers.image.url="https://github.com/ministryofjustice/analytical-platform-mlflow"
 
 ENV CONTAINER_USER="analyticalplatform" \
-    CONTAINER_UID="1001" \
+    CONTAINER_UID="1000" \
     CONTAINER_GROUP="analyticalplatform" \
-    CONTAINER_GID="1001" \
+    CONTAINER_GID="1000" \
     DEBIAN_FRONTEND="noninteractive" \
     MLFLOW_ROOT="/mlflow" \
-    MLFLOW_VERSION="2.15.1" \
-    BOTO3_VERSION="1.35.0" \
-    PROMETHEUS_FLASK_EXPORTER_VERSION="0.23.1" \
+    MLFLOW_VERSION="2.16.2" \
+    BOTO3_VERSION="1.35.25" \
     PSYCOPG2_BINARY_VERSION="2.9.9"
 
 SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
 
 RUN <<EOF
+userdel --remove --force ubuntu
+
 groupadd \
   --gid ${CONTAINER_GID} \
   ${CONTAINER_GROUP}
@@ -35,9 +36,9 @@ apt-get update --yes
 
 apt-get install --no-install-recommends --yes \
   "ca-certificates=20240203" \
-  "curl=8.5.0-2ubuntu10.3" \
+  "curl=8.5.0-2ubuntu10.4" \
   "libpq-dev=16.4-0ubuntu0.24.04.2" \
-  "python3.12=3.12.3-1ubuntu0.1" \
+  "python3.12=3.12.3-1ubuntu0.2" \
   "python3-pip=24.0+dfsg-1ubuntu1"
 
 apt-get clean --yes
@@ -47,7 +48,6 @@ rm --force --recursive /var/lib/apt/lists/*
 pip install --break-system-packages --no-cache-dir \
   "mlflow==${MLFLOW_VERSION}" \
   "boto3==${BOTO3_VERSION}" \
-  "prometheus-flask-exporter==${PROMETHEUS_FLASK_EXPORTER_VERSION}" \
   "psycopg2-binary==${PSYCOPG2_BINARY_VERSION}"
 
 install --directory --owner ${CONTAINER_USER} --group ${CONTAINER_GROUP} --mode 0755 ${MLFLOW_ROOT}
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index cbbaf98..112022c 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -3,8 +3,8 @@ apiVersion: v2
 name: mlflow
 description: MLflow Tracking Server
 type: application
-version: 2.15.1-rc2
-appVersion: 2.15.1-rc2
+version: 2.16.2-rc1
+appVersion: 2.16.2-rc1
 home: https://github.com/ministryofjustice/analytical-platform-mlflow
 sources:
   - https://github.com/mlflow/mlflow
diff --git a/chart/values.yaml b/chart/values.yaml
index 32e5d11..27ef830 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -6,7 +6,7 @@ fullnameOverride: ""
 image:
   repository: ghcr.io/ministryofjustice/analytical-platform-mlflow
   pullPolicy: IfNotPresent
-  tag: 2.15.1-rc2
+  tag: 2.16.2-rc1
 
 imagePullSecrets: []
 
diff --git a/test/container-structure-test.yml b/test/container-structure-test.yml
index badf4ab..338b7c1 100644
--- a/test/container-structure-test.yml
+++ b/test/container-structure-test.yml
@@ -17,12 +17,12 @@ commandTests:
   - name: "user"
     command: "id"
     args: ["--user", "analyticalplatform"]
-    expectedOutput: ["1001"]
+    expectedOutput: ["1000"]
 
   - name: "groups"
     command: "id"
     args: ["--groups", "analyticalplatform"]
-    expectedOutput: ["1001"]
+    expectedOutput: ["1000"]
 
   - name: "python"
     command: "python3"
@@ -37,7 +37,7 @@ commandTests:
   - name: "mlflow"
     command: "mlflow"
     args: ["--version"]
-    expectedOutput: ["mlflow, version 2.15.1"]
+    expectedOutput: ["mlflow, version 2.16.2"]
 
 fileExistenceTests:
   - name: "/mlflow"