Merge pull request #48 from cisagov/improvement/upgrade-to-alpine-3.1…

…8-and-python-3.12

Upgrade to Alpine 3.18 and Python 3.12

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11.2-alpine3.17 as compile-stage
+FROM python:3.12.0-alpine3.18 as compile-stage
 
 ###
 # For a list of pre-defined annotation keys and value types see:
@@ -18,10 +18,10 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
 
 
 # Versions of the Python packages installed directly
-ENV PYTHON_PIP_VERSION=23.0
-ENV PYTHON_PIPENV_VERSION=2023.2.4
-ENV PYTHON_SETUPTOOLS_VERSION=67.3.1
-ENV PYTHON_WHEEL_VERSION=0.38.4
+ENV PYTHON_PIP_VERSION=23.3.1
+ENV PYTHON_PIPENV_VERSION=2023.10.24
+ENV PYTHON_SETUPTOOLS_VERSION=68.2.2
+ENV PYTHON_WHEEL_VERSION=0.41.2
 
 # Install base Python requirements and then install pipenv to manage installing
 # the Python dependencies into a created Python virtual environment. This is
@@ -53,7 +53,7 @@ COPY src/Pipfile src/Pipfile.lock ./
 # VIRTUAL_ENV environment variable if it is set.
 RUN pipenv sync --clear --verbose
 
-FROM python:3.11.2-alpine3.17 as build-stage
+FROM python:3.12.0-alpine3.18 as build-stage
 
 ###
 # Unprivileged user setup variables

README.md

@@ -21,7 +21,7 @@ certificates.
 To run the `cisagov/client-cert-update` image via Docker:
 
 ```console
-docker run cisagov/client-cert-update:0.1.1
+docker run cisagov/client-cert-update:0.1.2
 ```
 
 ### Running with Docker Compose ###
@@ -34,7 +34,7 @@ docker run cisagov/client-cert-update:0.1.1
 
     services:
       update:
-        image: cisagov/client-cert-update:0.1.1
+        image: cisagov/client-cert-update:0.1.2
         init: true
         environment:
           - AWS_CONFIG_FILE=path/to/aws_config
@@ -82,7 +82,7 @@ environment variables.  See the
 
     services:
       update:
-        image: cisagov/client-cert-update:0.1.1
+        image: cisagov/client-cert-update:0.1.2
         init: true
         environment:
           - AWS_CONFIG_FILE=/run/secrets/aws_config
@@ -121,7 +121,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/client-cert-update:0.1.1
+    docker pull cisagov/client-cert-update:0.1.2
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -130,11 +130,11 @@ environment variables.  See the
 
 The images of this container are tagged with [semantic
 versions](https://semver.org).  It is recommended that most users use a version
-tag (e.g. `:0.1.1`).
+tag (e.g. `:0.1.2`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/client-cert-update:0.1.1`| An exact release version. |
+|`cisagov/client-cert-update:0.1.2`| An exact release version. |
 |`cisagov/client-cert-update:0.1`| The most recent release matching the major and minor version numbers. |
 |`cisagov/client-cert-update:0`| The most recent release matching the major version number. |
 |`cisagov/client-cert-update:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -196,7 +196,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/client-cert-update:0.1.1 \
+  --tag cisagov/client-cert-update:0.1.2 \
   https://github.com/cisagov/client-cert-update.git#develop
 ```
 
@@ -227,7 +227,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/client-cert-update:0.1.1 .
+      --tag cisagov/client-cert-update:0.1.2 .
     ```
 
 ## Contributing ##

src/version.txt

@@ -1 +1 @@
-__version__ = "0.1.1"
+__version__ = "0.1.2"