Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton

# Conflicts:
#	Dockerfile

Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.12.1-alpine
 =======
 # Official Docker images are in the form library/<app> while non-official
 # images are in the form <user>/<app>.
-FROM docker.io/library/python:3.13.1-alpine3.20 AS compile-stage
+FROM docker.io/library/python:3.13.2-alpine3.21 AS compile-stage
 
 ###
 # Unprivileged user variables
@@ -13,9 +13,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
 
 ###
@@ -56,8 +56,12 @@ RUN pipenv check --verbose \
 
 # Official Docker images are in the form library/<app> while non-official
 # images are in the form <user>/<app>.
+<<<<<<< HEAD
 FROM docker.io/library/python:3.13.1-alpine3.20 AS build-stage
 >>>>>>> 0d48ebd47a28a887868ea3093e675e95f3843561
+=======
+FROM docker.io/library/python:3.13.2-alpine3.21 AS build-stage
+>>>>>>> e8ec18bb4cfbcdc26f704c489e98112d312d9bdb
 
 ###
 # For a list of pre-defined annotation keys and value types see:

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"