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

# Conflicts:
#	Dockerfile
#	src/Pipfile
#	src/Pipfile.lock

Author: mcdonnnj

Dockerfile

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # We use an Alpine base image in the compile-stage because of the build
 # requirements for some of the Python requirements. When the python3-dev
 # package is installed it will also install the python3 package which leaves us
@@ -7,6 +8,11 @@
 # Docker image matches the version of the python3 package available on Alpine
 # for consistency.
 FROM docker.io/library/alpine:3.21 AS compile-stage
+=======
+# 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.2-alpine3.21 AS compile-stage
+>>>>>>> e8ec18bb4cfbcdc26f704c489e98112d312d9bdb
 
 ###
 # Unprivileged user variables
@@ -70,9 +76,15 @@ COPY src/Pipfile src/Pipfile.lock ./
 RUN pipenv check --verbose \
     && pipenv install --clear --deploy --extra-pip-args "--no-cache-dir" --verbose
 
+<<<<<<< HEAD
 # The version of Python used here should match the version of the Alpine
 # python3 package installed in the compile-stage.
 FROM docker.io/library/python:3.12.9-alpine3.21 AS build-stage
+=======
+# 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.2-alpine3.21 AS build-stage
+>>>>>>> e8ec18bb4cfbcdc26f704c489e98112d312d9bdb
 
 ###
 # For a list of pre-defined annotation keys and value types see:

src/Pipfile

@@ -18,4 +18,8 @@ docopt = ">=0.6.2"
 llnl-scraper = {file = "https://api.github.com/repos/LLNL/scraper/tarball/536a72ce1ceb2e209281ff72a2ed59e735d45c33"}
 
 [requires]
+<<<<<<< HEAD
 python_full_version = "3.12.9"
+=======
+python_full_version = "3.13.2"
+>>>>>>> e8ec18bb4cfbcdc26f704c489e98112d312d9bdb