Skip to content

Commit 7e51f05

Browse files
authored
Patch analytical-platform-airflow-python-base due to CVE alerts (#125)
* patch fixes * remove temp trivy ignore
1 parent fe6a40c commit 7e51f05

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

.devcontainer/devcontainer-lock.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"features": {
3-
"ghcr.io/devcontainers/features/docker-in-docker:2": {
4-
"version": "2.12.3",
5-
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:c36ff66a35d1c40409a0fc1a7995616eaaa76574953b6ed675d8622e2d0bbcc5",
6-
"integrity": "sha256:c36ff66a35d1c40409a0fc1a7995616eaaa76574953b6ed675d8622e2d0bbcc5"
7-
},
83
"ghcr.io/devcontainers/features/docker-in-docker:": {
94
"version": "2.12.4",
105
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:7f32d985aac6929b4f37cf8a0bdb9196473e9e192281a3d708207a70633f83df",
116
"integrity": "sha256:7f32d985aac6929b4f37cf8a0bdb9196473e9e192281a3d708207a70633f83df"
127
},
8+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
9+
"version": "2.12.3",
10+
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:c36ff66a35d1c40409a0fc1a7995616eaaa76574953b6ed675d8622e2d0bbcc5",
11+
"integrity": "sha256:c36ff66a35d1c40409a0fc1a7995616eaaa76574953b6ed675d8622e2d0bbcc5"
12+
},
1313
"ghcr.io/ministryofjustice/devcontainer-feature/container-structure-test:1": {
1414
"version": "1.0.0",
1515
"resolved": "ghcr.io/ministryofjustice/devcontainer-feature/container-structure-test@sha256:19eb30f9eb327b667be2002757d55381de87cdb5a79a6e37d293369fe8ad01ad",

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#checkov:skip=CKV_DOCKER_2: HEALTHCHECK not required - Health checks are implemented downstream of this image
22

3-
FROM public.ecr.aws/ubuntu/ubuntu:24.04@sha256:5dcf95d194f9781a99394c4084c4d2930fb7576c36f5abf817ccc13ef6a55c34
3+
FROM public.ecr.aws/ubuntu/ubuntu:24.04@sha256:ef59d9e82939bbce08973bdffb8761b025f75369fb7d2882cdc4938b5a9e992e
44
LABEL org.opencontainers.image.vendor="Ministry of Justice" \
55
org.opencontainers.image.authors="Analytical Platform (analytical-platform@digital.justice.gov.uk)" \
66
org.opencontainers.image.title="Airflow Python Base" \
@@ -18,14 +18,14 @@ ENV CONTAINER_USER="analyticalplatform" \
1818
ANALYTICAL_PLATFORM_DIRECTORY="/opt/analyticalplatform" \
1919
DEBIAN_FRONTEND="noninteractive" \
2020
PIP_BREAK_SYSTEM_PACKAGES="1" \
21-
AWS_CLI_VERSION="2.31.4" \
21+
AWS_CLI_VERSION="2.31.20" \
2222
CUDA_VERSION="12.9.1" \
2323
NVIDIA_DISABLE_REQUIRE="true" \
2424
NVIDIA_CUDA_CUDART_VERSION="12.9.79-1" \
2525
NVIDIA_CUDA_COMPAT_VERSION="575.57.08-0ubuntu1" \
2626
NVIDIA_VISIBLE_DEVICES="all" \
2727
NVIDIA_DRIVER_CAPABILITIES="compute,utility" \
28-
UV_VERSION="0.8.22" \
28+
UV_VERSION="0.9.5" \
2929
LD_LIBRARY_PATH="/usr/local/nvidia/lib:/usr/local/nvidia/lib64" \
3030
PATH="/usr/local/nvidia/bin:/usr/local/cuda/bin:/home/analyticalplatform/.local/bin:${PATH}"
3131

test/container-structure-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,17 @@ commandTests:
4242
- name: "aws"
4343
command: "aws"
4444
args: ["--version"]
45-
expectedOutput: ["aws-cli/2.31.4"]
45+
expectedOutput: ["aws-cli/2.31.20"]
4646

4747
- name: "uv"
4848
command: "uv"
4949
args: ["--version"]
50-
expectedOutput: ["uv 0.8.22"]
50+
expectedOutput: ["uv 0.9.5"]
5151

5252
- name: "uvx"
5353
command: "uvx"
5454
args: ["--version"]
55-
expectedOutput: ["uvx 0.8.22"]
55+
expectedOutput: ["uvx 0.9.5"]
5656

5757
fileExistenceTests:
5858
- name: "/opt/analyticalplatform"

0 commit comments

Comments
 (0)