From 058ed0fb22642d15de967893491a3bcc5b0e0a59 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:33:12 -0500 Subject: [PATCH 1/4] Bump Alpine Linux from 3.20 to 3.21 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffcae61..a4543c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Official Docker images are in the form library/ while non-official # images are in the form /. -FROM docker.io/library/python:3.13.1-alpine3.20 AS compile-stage +FROM docker.io/library/python:3.13.1-alpine3.21 AS compile-stage ### # Unprivileged user variables @@ -53,7 +53,7 @@ RUN pipenv check --verbose \ # Official Docker images are in the form library/ while non-official # images are in the form /. -FROM docker.io/library/python:3.13.1-alpine3.20 AS build-stage +FROM docker.io/library/python:3.13.1-alpine3.21 AS build-stage ### # For a list of pre-defined annotation keys and value types see: From c5a03253420825371ee0bfec2ebcf545647cdf55 Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:35:10 -0500 Subject: [PATCH 2/4] Bump Python from 3.12.1 to 3.12.2 --- Dockerfile | 4 ++-- src/Pipfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a4543c8..5f0c159 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # Official Docker images are in the form library/ while non-official # images are in the form /. -FROM docker.io/library/python:3.13.1-alpine3.21 AS compile-stage +FROM docker.io/library/python:3.13.2-alpine3.21 AS compile-stage ### # Unprivileged user variables @@ -53,7 +53,7 @@ RUN pipenv check --verbose \ # Official Docker images are in the form library/ while non-official # images are in the form /. -FROM docker.io/library/python:3.13.1-alpine3.21 AS build-stage +FROM docker.io/library/python:3.13.2-alpine3.21 AS build-stage ### # For a list of pre-defined annotation keys and value types see: diff --git a/src/Pipfile b/src/Pipfile index fdd19e6..3d6e430 100644 --- a/src/Pipfile +++ b/src/Pipfile @@ -10,4 +10,4 @@ example = {file = "https://github.com/cisagov/skeleton-python-library/archive/v0 # This version should match the version of Python in the image [requires] -python_full_version = "3.13.1" +python_full_version = "3.13.2" From 228f06a39772c80bfe44358ccecb716e8f42757c Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:36:37 -0500 Subject: [PATCH 3/4] Update Dockerfile Python dependencies Bump the following package versions: - pip from 24.3.1 to 25.0.1 - pipenv from 2024.4.0 to 2024.4.1 - setuptools from 75.6.0 to 75.8.0 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f0c159..38242be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,9 @@ ENV CISA_HOME="/home/${CISA_USER}" ENV VIRTUAL_ENV="${CISA_HOME}/.venv" # Versions of the Python packages installed directly -ENV PYTHON_PIP_VERSION=24.3.1 -ENV PYTHON_PIPENV_VERSION=2024.4.0 -ENV PYTHON_SETUPTOOLS_VERSION=75.6.0 +ENV PYTHON_PIP_VERSION=25.0.1 +ENV PYTHON_PIPENV_VERSION=2024.4.1 +ENV PYTHON_SETUPTOOLS_VERSION=75.8.0 ENV PYTHON_WHEEL_VERSION=0.45.1 ### From 99bb46d2c93f1be1941f67bfcaa3d730314ec99a Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Tue, 11 Feb 2025 13:40:24 -0500 Subject: [PATCH 4/4] Update Python virtual environment dependencies Update the dependencies installed in the Python virtual environment by running `pipenv lock` in the `src/` directory. --- src/Pipfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Pipfile.lock b/src/Pipfile.lock index 408d508..5211e41 100644 --- a/src/Pipfile.lock +++ b/src/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "8a376df6f25cf8583d5da89da420c5e51660f33a081c1f85236643ef31601833" + "sha256": "14f654f32f8b048255b0931440c8189b82643981e9d8d581eaceeef9d87603bb" }, "pipfile-spec": 6, "requires": { - "python_full_version": "3.13.1" + "python_full_version": "3.13.2" }, "sources": [ { @@ -34,11 +34,11 @@ }, "setuptools": { "hashes": [ - "sha256:8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6", - "sha256:ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d" + "sha256:c5afc8f407c626b8313a86e10311dd3f661c6cd9c09d4bf8c15c0e11f9f2b0e6", + "sha256:e3982f444617239225d675215d51f6ba05f845d4eec313da4418fdbb56fb27e3" ], "markers": "python_version >= '3.9'", - "version": "==75.6.0" + "version": "==75.8.0" } }, "develop": {}