Merge pull request #25 from cisagov/maintenance/update_image_dependencies

Update Image Dependencies

Author: mcdonnnj

Dockerfile

@@ -1,4 +1,4 @@
-ARG PY_VERSION=3.9.6
+ARG PY_VERSION=3.10.5
 
 FROM python:${PY_VERSION}-bullseye AS compile-stage
 
@@ -10,7 +10,7 @@ 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.10+dfsg-6.7 \
+    libxml2-dev=2.9.10+dfsg-6.7+deb11u2 \
     libxslt1-dev=1.1.34-4
 
 ENV PY_VENV=/.venv
@@ -21,10 +21,10 @@ ENV PATH="${PY_VENV}/bin:$PATH"
 
 # Install core Python dependencies
 RUN python -m pip install --no-cache-dir \
-  pip==21.1.3 \
-  pipenv==2021.5.29 \
-  setuptools==57.4.0 \
-  wheel==0.36.2
+  pip==22.1.2 \
+  pipenv==2022.6.7 \
+  setuptools==62.4.0 \
+  wheel==0.37.1
 
 # Install vdp_scanner.py requirements
 COPY src/Pipfile Pipfile
@@ -41,9 +41,9 @@ FROM python:${PY_VERSION}-slim-bullseye AS build-stage
 RUN apt-get update \
   && apt-get install -y --allow-downgrades --no-install-recommends \
     ca-certificates=20210119 \
-    chromium=90.0.4430.212-1 \
-    chromium-common=90.0.4430.212-1 \
-    libxml2-dev=2.9.10+dfsg-6.7 \
+    chromium=102.0.5005.115-1~deb11u1 \
+    chromium-common=102.0.5005.115-1~deb11u1 \
+    libxml2-dev=2.9.10+dfsg-6.7+deb11u2 \
     libxslt1-dev=1.1.34-4 \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*

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.5-rc.1
+docker run cisagov/vdp-scanner:0.0.5
 ```
 
 ### Running with Docker Compose ###
@@ -38,7 +38,7 @@ docker run cisagov/vdp-scanner:0.0.5-rc.1
 
     services:
       vdp-scanner:
-        image: 'cisagov/vdp-scanner:0.0.5-rc.1'
+        image: 'cisagov/vdp-scanner:0.0.5'
         volumes:
           - .:/task/host_mount
     ```
@@ -76,7 +76,7 @@ docker run cisagov/vdp-scanner:0.0.5-rc.1
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/vdp-scanner:0.0.5-rc.1
+    docker pull cisagov/vdp-scanner:0.0.5
     ```
 
 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.5-rc.1
 
 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.5-rc.1`).
+a version tag (e.g. `:0.0.5`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/vdp-scanner:0.0.5-rc.1`| An exact release version. |
+|`cisagov/vdp-scanner:0.0.5`| 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.5-rc.1 \
+  --tag cisagov/vdp-scanner:0.0.5 \
   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.5-rc.1 .
+      --tag cisagov/vdp-scanner:0.0.5 .
     ```
 
 ## Contributing ##

src/Pipfile

@@ -5,14 +5,9 @@ name = "pypi"
 
 [packages]
 docopt = "*"
-hash-http-content = {file = "https://github.com/cisagov/hash-http-content/archive/v0.0.1.tar.gz"}
+hash-http-content = {file = "https://github.com/cisagov/hash-http-content/archive/v0.1.0.tar.gz"}
 requests = "*"
 urllib3 = "*"
-pip = "*"
-setuptools = "*"
-wheel = "*"
-
-[dev-packages]
 
 [requires]
-python_version = "3.9.6"
+python_version = "3.10.5"