diff --git a/.trivyignore b/.trivyignore index 47e933b..50a31bd 100644 --- a/.trivyignore +++ b/.trivyignore @@ -1,6 +1,7 @@ # Ubuntu CVE-2024-43882 CVE-2024-53103 +CVE-2024-56658 # Python ## setuptools @@ -19,5 +20,5 @@ CVE-2024-0057 ## aws-sso CVE-2024-41110 # Vulnerability in github.com/docker/docker, but we don't run Docker on CDE CVE-2024-34156 - CVE-2024-45337 - CVE-2024-45338 +CVE-2024-45337 +CVE-2024-45338 diff --git a/Dockerfile b/Dockerfile index 9c79dc7..c598e19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,15 +15,15 @@ ENV CONTAINER_USER="analyticalplatform" \ ANALYTICAL_PLATFORM_DIRECTORY="/opt/analytical-platform" \ DEBIAN_FRONTEND="noninteractive" \ PIP_BREAK_SYSTEM_PACKAGES="1" \ - AWS_CLI_VERSION="2.22.28" \ + AWS_CLI_VERSION="2.23.3" \ AWS_SSO_CLI_VERSION="1.17.0" \ MINICONDA_VERSION="24.11.1-0" \ MINICONDA_SHA256="636b209b00b6673471f846581829d4b96b9c3378679925a59a584257c3fef5a3" \ - NODE_LTS_VERSION="22.12.0" \ - CORRETTO_VERSION="1:21.0.5.11-1" \ - DOTNET_SDK_VERSION="8.0.111-0ubuntu1~24.04.1" \ + NODE_LTS_VERSION="22.13.1" \ + CORRETTO_VERSION="1:21.0.6.7-1" \ + DOTNET_SDK_VERSION="8.0.112-0ubuntu1~24.04.1" \ R_VERSION="4.4.2-1.2404.0" \ - OLLAMA_VERSION="0.5.4" \ + OLLAMA_VERSION="0.5.7" \ KUBECTL_VERSION="1.29.12" \ HELM_VERSION="3.16.4" \ CLOUD_PLATFORM_CLI_VERSION="1.37.14" \ @@ -67,14 +67,14 @@ apt-get install --yes \ "apt-transport-https=2.7.14build2" \ "ca-certificates=20240203" \ "curl=8.5.0-2ubuntu10.6" \ - "git=1:2.43.0-1ubuntu7.1" \ + "git=1:2.43.0-1ubuntu7.2" \ "ffmpeg=7:6.1.1-3ubuntu5" \ "jq=1.7.1-3build1" \ "mandoc=1.14.6-1" \ "less=590-2ubuntu2.1" \ - "python3.12=3.12.3-1ubuntu0.3" \ + "python3.12=3.12.3-1ubuntu0.4" \ "python3-pip=24.0+dfsg-1ubuntu1.1" \ - "vim=2:9.1.0016-1ubuntu7.5" \ + "vim=2:9.1.0016-1ubuntu7.6" \ "unixodbc=2.3.12-1ubuntu0.24.04.1" \ "unzip=6.0-28ubuntu4.1" diff --git a/test/container-structure-test.yml b/test/container-structure-test.yml index 8b2331c..68b42bd 100644 --- a/test/container-structure-test.yml +++ b/test/container-structure-test.yml @@ -42,7 +42,7 @@ commandTests: - name: "aws" command: "aws" args: ["--version"] - expectedOutput: ["aws-cli/2.22.28"] + expectedOutput: ["aws-cli/2.23.3"] - name: "aws-sso" command: "aws-sso" @@ -67,17 +67,17 @@ commandTests: - name: "node" command: "node" args: ["--version"] - expectedOutput: ["v22.12.0"] + expectedOutput: ["v22.13.1"] - name: "corretto" command: "java" args: ["--version"] - expectedOutput: ["openjdk 21.0.5"] + expectedOutput: ["openjdk 21.0.6"] - name: "dotnet" command: "dotnet" args: ["--version"] - expectedOutput: ["8.0.111"] + expectedOutput: ["8.0.112"] - name: "r" command: "R" @@ -87,7 +87,7 @@ commandTests: - name: "ollama" command: "ollama" args: ["--version"] - expectedOutput: ["0.5.4"] + expectedOutput: ["0.5.7"] - name: "kubectl" command: "kubectl"