Merge pull request #74 from cisagov/improvement/switch_to_cisagov_fork

Switch to cisagov fork of domain-scan

Dockerfile

@@ -67,7 +67,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools
 # the file.  (trustymail imports only in the scan function, so it
 # isn't required here.)
 ###
-RUN pip install --no-cache-dir --upgrade pshtt==0.6.9
+RUN pip install --no-cache-dir --upgrade pshtt==0.6.10
 
 ###
 # Install domain-scan
@@ -78,7 +78,7 @@ RUN pip install --no-cache-dir --upgrade pshtt==0.6.9
 ###
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir ${CISA_HOME}/domain-scan \
-    && curl --location https://github.com/18F/domain-scan/tarball/master \
+    && curl --location https://github.com/cisagov/domain-scan/tarball/master \
     | tar --extract --gzip --strip-components 1 --directory ${CISA_HOME}/domain-scan/
 RUN pip install --no-cache-dir --upgrade \
     --requirement ${CISA_HOME}/domain-scan/requirements.txt

README.md

@@ -32,7 +32,7 @@ expects the secrets in a different location.
 To run the `cisagov/scanner` image via Docker:
 
 ```console
-docker run cisagov/scanner:1.3.4
+docker run cisagov/scanner:1.3.5
 ```
 
 ### Running with Docker Compose ###
@@ -45,7 +45,7 @@ docker run cisagov/scanner:1.3.4
 
     services:
       scanner:
-        image: cisagov/scanner:1.3.4
+        image: cisagov/scanner:1.3.5
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -89,7 +89,7 @@ environment variables.  See the
 
     services:
       scanner:
-        image: cisagov/scanner:1.3.4
+        image: cisagov/scanner:1.3.5
         volumes:
           - type: bind
             source: <your_log_dir>
@@ -126,7 +126,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/scanner:1.3.4
+    docker pull cisagov/scanner:1.3.5
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -136,11 +136,11 @@ environment variables.  See the
 The images of this container are tagged with [semantic
 versions](https://semver.org) of the underlying example project that they
 containerize.  It is recommended that most users use a version tag (e.g.
-`:1.3.4`).
+`:1.3.5`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/scanner:1.3.4`| An exact release version. |
+|`cisagov/scanner:1.3.5`| An exact release version. |
 |`cisagov/scanner:1.3`| The most recent release matching the major and minor version numbers. |
 |`cisagov/scanner:1`| The most recent release matching the major version number. |
 |`cisagov/scanner:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -200,8 +200,8 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --build-arg VERSION=1.3.4 \
-  --tag cisagov/scanner:1.3.4 \
+  --build-arg VERSION=1.3.5 \
+  --tag cisagov/scanner:1.3.5 \
   https://github.com/cisagov/scanner.git#develop
 ```
 
@@ -231,9 +231,9 @@ Docker:
     docker buildx build \
       --file Dockerfile-x \
       --platform linux/amd64 \
-      --build-arg VERSION=1.3.4 \
+      --build-arg VERSION=1.3.5 \
       --output type=docker \
-      --tag cisagov/scanner:1.3.4 .
+      --tag cisagov/scanner:1.3.5 .
     ```
 
 ## Contributing ##

src/version.txt

@@ -1 +1 @@
-__version__ = "1.3.4"
+__version__ = "1.3.5"