Merge pull request #94 from cisagov/bugfix/fix_for_domain_csv_changes

Update image configuration and fix CSV processing

Author: mcdonnnj

Dockerfile

@@ -14,21 +14,21 @@ ENV CISA_HOME="/home/${CISA_USER}"
 ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
 
 # Versions of the Python packages installed directly
-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
+ENV PYTHON_PIP_VERSION=24.0
+ENV PYTHON_PIPENV_VERSION=2023.12.1
+ENV PYTHON_SETUPTOOLS_VERSION=69.2.0
+ENV PYTHON_WHEEL_VERSION=0.43.0
 
 RUN apk --no-cache add \
   gcc=12.2.1_git20220924-r10 \
   libc-dev=0.7.2-r5 \
-  libxml2-dev=2.11.6-r0 \
+  libxml2-dev=2.11.7-r00 \
   libxslt-dev=1.1.38-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
+  python3-dev=3.11.8-r0 \
+  python3=3.11.8-r0
 
 # Install pipenv to manage installing the Python dependencies into a created
 # Python virtual environment. This is done separately from the virtual
@@ -52,7 +52,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.11.6-alpine3.18 AS build-stage
+FROM python:3.11.8-alpine3.18 AS build-stage
 
 ###
 # For a list of pre-defined annotation keys and value types see:
@@ -72,9 +72,9 @@ ENV CISA_HOME="/home/${CISA_USER}"
 ENV VIRTUAL_ENV="${CISA_HOME}/.venv"
 
 RUN apk --no-cache add \
-  ca-certificates=20230506-r0 \
+  ca-certificates=20240226-r0 \
   chromium=119.0.6045.159-r0 \
-  libxml2=2.11.6-r0 \
+  libxml2=2.11.7-r00 \
   libxslt=1.1.38-r0
 
 # Create unprivileged user

README.md

@@ -23,7 +23,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.2.0-dev.3
+docker run cisagov/vdp-scanner:0.2.0-dev.4
 ```
 
 ### Running with Docker Compose ###
@@ -36,7 +36,7 @@ docker run cisagov/vdp-scanner:0.2.0-dev.3
 
     services:
       vdp-scanner:
-        image: 'cisagov/vdp-scanner:0.2.0-dev.3'
+        image: 'cisagov/vdp-scanner:0.2.0-dev.4'
         volumes:
           - .:/task/host_mount
     ```
@@ -74,7 +74,7 @@ docker run cisagov/vdp-scanner:0.2.0-dev.3
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/vdp-scanner:0.2.0-dev.3
+    docker pull cisagov/vdp-scanner:0.2.0-dev.4
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -83,11 +83,11 @@ docker run cisagov/vdp-scanner:0.2.0-dev.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.2.0-dev.3`).
+a version tag (e.g. `:0.2.0-dev.4`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/vdp-scanner:0.2.0-dev.3`| An exact release version. |
+|`cisagov/vdp-scanner:0.2.0-dev.4`| An exact release version. |
 |`cisagov/vdp-scanner:0.2`| 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. |
@@ -153,7 +153,7 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --tag cisagov/vdp-scanner:0.2.0-dev.3 \
+  --tag cisagov/vdp-scanner:0.2.0-dev.4 \
   https://github.com/cisagov/vdp-scanner-docker.git#develop
 ```
 
@@ -184,7 +184,7 @@ Docker:
       --file Dockerfile-x \
       --platform linux/amd64 \
       --output type=docker \
-      --tag cisagov/vdp-scanner:0.2.0-dev.3 .
+      --tag cisagov/vdp-scanner:0.2.0-dev.4 .
     ```
 
 ## Contributing ##

src/Pipfile

@@ -10,4 +10,4 @@ requests = "*"
 urllib3 = "*"
 
 [requires]
-python_full_version = "3.10.10"
+python_full_version = "3.11.8"