Merge pull request #55 from cisagov/dependabot/docker/alpine-3.18

Bump alpine from 3.17 to 3.18

Dockerfile

@@ -6,7 +6,7 @@
 # in the Python Docker image we use for the build-stage. The tag of the Python
 # Docker image matches the version of the python3 package available on Alpine
 # for consistency.
-FROM alpine:3.17 as compile-stage
+FROM alpine:3.18 as compile-stage
 
 ###
 # For a list of pre-defined annotation keys and value types see:
@@ -23,26 +23,26 @@ ENV CISA_HOME="/home/${CISA_USER}"
 ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
 
 # Versions of the Python packages installed directly
-ENV PYTHON_PIP_VERSION=23.0.1
-ENV PYTHON_PIPENV_VERSION=2023.2.18
-ENV PYTHON_SETUPTOOLS_VERSION=67.6.0
+ENV PYTHON_PIP_VERSION=23.1.2
+ENV PYTHON_PIPENV_VERSION=2023.10.20
+ENV PYTHON_SETUPTOOLS_VERSION=67.7.2
 ENV PYTHON_WHEEL_VERSION=0.40.0
 
 # Install the dependencies necessary to build the cryptography Python
 # package. These are required to build the package if a pre-built wheel
 # is not available on PyPI.
 RUN apk --no-cache add \
-  cargo=1.64.0-r2 \
-  gcc=12.2.1_git20220924-r4 \
-  git=2.38.5-r0 \
-  libffi-dev=3.4.4-r0 \
-  musl-dev=1.2.3-r5 \
-  openssl-dev=3.0.12-r0 \
-  py3-pip=22.3.1-r1 \
-  py3-setuptools=65.6.0-r0 \
-  py3-wheel=0.38.4-r0 \
-  python3-dev=3.10.13-r0 \
-  python3=3.10.13-r0
+  cargo=1.71.1-r0 \
+  gcc=12.2.1_git20220924-r10 \
+  git=2.40.1-r0 \
+  libffi-dev=3.4.4-r2 \
+  musl-dev=1.2.4-r2 \
+  openssl-dev=3.1.4-r0 \
+  py3-pip=23.1.2-r0 \
+  py3-setuptools=67.7.2-r0 \
+  py3-wheel=0.40.0-r1 \
+  python3-dev=3.11.6-r0 \
+  python3=3.11.6-r0
 
 # Copy in our custom Cargo configuration file
 COPY src/config.toml /root/.cargo/
@@ -67,7 +67,7 @@ RUN pipenv sync --clear --verbose
 
 # The version of Python used here should match the version of the Alpine
 # python3 package installed in the compile-stage.
-FROM python:3.12.0-alpine3.17 as build-stage
+FROM python:3.11.6-alpine3.18 as build-stage
 
 # Unprivileged user information
 ARG CISA_UID=2048
@@ -80,8 +80,8 @@ ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
 # Install the dependencies needed by the llnl-scraper Python package to
 # estimate labor hours for code.
 RUN apk --no-cache add \
-  cloc=1.94-r0 \
-  git=2.38.5-r0
+  cloc=1.96-r0 \
+  git=2.40.1-r0
 
 # Create unprivileged user
 RUN addgroup --system --gid ${CISA_GID} ${CISA_GROUP} \

README.md

@@ -31,7 +31,7 @@ hosted [here](https://www.dhs.gov/code.json).
 To run the `cisagov/code-gov-update` image via Docker:
 
 ```console
-docker run cisagov/code-gov-update:0.1.5
+docker run cisagov/code-gov-update:0.1.6
 ```
 
 ### Running with Docker Compose ###
@@ -44,7 +44,7 @@ docker run cisagov/code-gov-update:0.1.5
 
     services:
       update:
-        image: 'cisagov/code-gov-update:0.1.5'
+        image: 'cisagov/code-gov-update:0.1.6'
         init: true
         environment:
           - AWS_CONFIG_FILE=path/to/aws_config
@@ -92,7 +92,7 @@ environment variables.  See the
 
     services:
       update:
-        image: 'cisagov/code-gov-update:0.1.5'
+        image: 'cisagov/code-gov-update:0.1.6'
         init: true
         secrets:
           - source: aws_config
@@ -131,7 +131,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/code-gov-update:0.1.5
+    docker pull cisagov/code-gov-update:0.1.6
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -140,11 +140,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.5`).
+tag (e.g. `:0.1.6`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/code-gov-update:0.1.5`| An exact release version. |
+|`cisagov/code-gov-update:0.1.6`| An exact release version. |
 |`cisagov/code-gov-update:0.1`| The most recent release matching the major and minor version numbers. |
 |`cisagov/code-gov-update:0`| The most recent release matching the major version number. |
 |`cisagov/code-gov-update:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -209,7 +209,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/code-gov-update:0.1.5 \
+  --tag cisagov/code-gov-update:0.1.6 \
   https://github.com/cisagov/code-gov-update.git#develop
 ```
 
@@ -240,7 +240,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/code-gov-update:0.1.5 .
+      --tag cisagov/code-gov-update:0.1.6 .
     ```
 
 ## Contributing ##

src/version.txt

@@ -1 +1 @@
-__version__ = "0.1.5"
+__version__ = "0.1.6"