From 3573f3454c98d8e2f6c92f3eed7d3190e390afdc Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Wed, 18 Aug 2021 09:20:40 -0400
Subject: [PATCH 1/3] Use a more specific tag for the base Docker image

The `3.9.6` and `3.9.6-slim` tags are shared tags that changed references from
`3.9.6-buster` to `3.9.6-bullseye` upon the release of Debian Bullseye on
2021-08-14. This is undesirable behavior for repeatable builds so I have made
the tag we use as specific as possible.
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 701de76..340b6d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 ARG PY_VERSION=3.9.6
 
-FROM python:${PY_VERSION} AS compile-stage
+FROM python:${PY_VERSION}-bullseye AS compile-stage
 
 # For a list of pre-defined annotation keys and value types see:
 # https://github.com/opencontainers/image-spec/blob/master/annotations.md
@@ -36,7 +36,7 @@ RUN PIPENV_VENV_IN_PROJECT=1 pipenv sync
 # as a last step.
 RUN python -m pip uninstall --yes pipenv
 
-FROM python:${PY_VERSION}-slim AS build-stage
+FROM python:${PY_VERSION}-slim-bullseye AS build-stage
 
 RUN apt-get update \
   && apt-get install -y --allow-downgrades --no-install-recommends \

From 99d63012424b6b79a7175974bf6456b744909294 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Wed, 18 Aug 2021 09:37:41 -0400
Subject: [PATCH 2/3] Update Debian package pins

With the switch to a Debian Bullseye based image we need to update the version
pins so that an image can successfully build.
---
 Dockerfile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 340b6d8..328a9fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security
 
 RUN apt-get update \
   && apt-get install -y --allow-downgrades --no-install-recommends \
-    libxml2-dev=2.9.4+dfsg1-7+deb10u2 \
-    libxslt1-dev=1.1.32-2.2~deb10u1
+    libxml2-dev=2.9.10+dfsg-6.7 \
+    libxslt1-dev=1.1.34-4
 
 ENV PY_VENV=/.venv
 
@@ -40,14 +40,11 @@ FROM python:${PY_VERSION}-slim-bullseye AS build-stage
 
 RUN apt-get update \
   && apt-get install -y --allow-downgrades --no-install-recommends \
-    ca-certificates=20200601~deb10u2 \
-    # This is the latest version of the chromium package that is available for
-    # all of our supported platforms. Since it depends on the chromium-common
-    # package of the same version we need to force installation of that as well.
-    chromium=89.0.4389.114-1~deb10u1 \
-    chromium-common=89.0.4389.114-1~deb10u1 \
-    libxml2-dev=2.9.4+dfsg1-7+deb10u2 \
-    libxslt1-dev=1.1.32-2.2~deb10u1 \
+    ca-certificates=20210119 \
+    chromium=90.0.4430.212-1 \
+    chromium-common=90.0.4430.212-1 \
+    libxml2-dev=2.9.10+dfsg-6.7 \
+    libxslt1-dev=1.1.34-4 \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

From 2fb73d9d4c865b5db4e53d970eef52fc22ba81f6 Mon Sep 17 00:00:00 2001
From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com>
Date: Wed, 18 Aug 2021 09:40:56 -0400
Subject: [PATCH 3/3] Bump version from 0.0.3 to 0.0.4

---
 README.md       | 14 +++++++-------
 src/version.txt |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 2cded42..8e2f216 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Python library. Then it will output CSVs with agency and domain level results.
 To run the `cisagov/vdp-scanner` image via Docker:
 
 ```console
-docker run cisagov/vdp-scanner:0.0.3
+docker run cisagov/vdp-scanner:0.0.4
 ```
 
 ### Running with Docker Compose ###
@@ -38,7 +38,7 @@ docker run cisagov/vdp-scanner:0.0.3
 
     services:
       vdp-scanner:
-        image: 'cisagov/vdp-scanner:0.0.3'
+        image: 'cisagov/vdp-scanner:0.0.4'
         volumes:
           - .:/task/host_mount
     ```
@@ -76,7 +76,7 @@ docker run cisagov/vdp-scanner:0.0.3
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/vdp-scanner:0.0.3
+    docker pull cisagov/vdp-scanner:0.0.4
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -85,11 +85,11 @@ docker run cisagov/vdp-scanner:0.0.3
 
 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.0.3`).
+a version tag (e.g. `:0.0.4`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/vdp-scanner:0.0.3`| An exact release version. |
+|`cisagov/vdp-scanner:0.0.4`| An exact release version. |
 |`cisagov/vdp-scanner:0.0`| The most recent release matching the major and minor version numbers. |
 |`cisagov/vdp-scanner:0`| The most recent release matching the major version number. |
 |`cisagov/vdp-scanner:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -155,7 +155,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/vdp-scanner:0.0.3 \
+  --tag cisagov/vdp-scanner:0.0.4 \
   https://github.com/cisagov/vdp-scanner-docker.git#develop
 ```
 
@@ -186,7 +186,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/vdp-scanner:0.0.3 .
+      --tag cisagov/vdp-scanner:0.0.4 .
     ```
 
 ## Contributing ##
diff --git a/src/version.txt b/src/version.txt
index 27fdca4..81f0fde 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1 +1 @@
-__version__ = "0.0.3"
+__version__ = "0.0.4"