Merge pull request #96 from cisagov/improvement/use-cisagov-fork-of-d…

…omain-scan

Use cisagov fork of 18F/domain-scan

Dockerfile

@@ -61,7 +61,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools
 ###
 # Install domain-scan
 ###
-RUN git clone https://github.com/18F/domain-scan \
+RUN git clone https://github.com/cisagov/domain-scan \
     ${CISA_HOME}/domain-scan/
 RUN pip install --no-cache-dir --upgrade \
     --requirement ${CISA_HOME}/domain-scan/requirements.txt

README.md

@@ -10,9 +10,11 @@
 [![Docker Image Size (latest by date)](https://img.shields.io/docker/image-size/cisagov/gatherer)](https://hub.docker.com/r/cisagov/gatherer)
 [![Platforms](https://img.shields.io/badge/platforms-amd64%20%7C%20arm%2Fv6%20%7C%20arm%2Fv7%20%7C%20arm64%20%7C%20ppc64le%20%7C%20s390x-blue)](https://hub.docker.com/r/cisagov/gatherer/tags)
 
-This is a Docker container that uses
-[domain-scan](https://github.com/18F/domain-scan) to gather domains as
-a precursor to scanning by [pshtt](https://github.com/cisagov/pshtt),
+This is a Docker container that uses [the `cisagov`
+fork](https://github.com/cisagov/domain-scan) of 18F's
+[`domain-scan`](https://github.com/18F/domain-scan) to gather domains
+as a precursor to scanning by
+[pshtt](https://github.com/cisagov/pshtt),
 [trustymail](https://github.com/cisagov/trustymail), and
 [sslyze](https://github.com/nabla-c0d3/sslyze).
 
@@ -32,7 +34,7 @@ expects the secrets in a different location.
 To run the `cisagov/gatherer` image via Docker:
 
 ```console
-docker run cisagov/gatherer:1.5.10
+docker run cisagov/gatherer:1.5.11
 ```
 
 ### Running with Docker Compose ###
@@ -45,7 +47,7 @@ docker run cisagov/gatherer:1.5.10
 
     services:
       gatherer:
-        image: cisagov/gatherer:1.5.10
+        image: cisagov/gatherer:1.5.11
         volumes:
           - type: bind
             source: <your_output_dir>
@@ -91,7 +93,7 @@ environment variables.  See the
 
     services:
       gatherer:
-        image: cisagov/gatherer:1.5.10
+        image: cisagov/gatherer:1.5.11
         volumes:
           - type: bind
             source: <your_output_dir>
@@ -128,7 +130,7 @@ environment variables.  See the
 1. Pull the new image:
 
     ```console
-    docker pull cisagov/gatherer:1.5.10
+    docker pull cisagov/gatherer:1.5.11
     ```
 
 1. Recreate and run the container by following the [previous instructions](#running-with-docker).
@@ -138,11 +140,11 @@ environment variables.  See the
 The images of this container are tagged with [semantic
 versions](https://semver.org) of the underlying gatherer project that they
 containerize.  It is recommended that most users use a version tag (e.g.
-`:1.5.10`).
+`:1.5.11`).
 
 | Image:tag | Description |
 |-----------|-------------|
-|`cisagov/gatherer:1.5.10`| An exact release version. |
+|`cisagov/gatherer:1.5.11`| An exact release version. |
 |`cisagov/gatherer:1.5`| The most recent release matching the major and minor version numbers. |
 |`cisagov/gatherer:1`| The most recent release matching the major version number. |
 |`cisagov/gatherer:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
@@ -205,8 +207,8 @@ Build the image locally using this git repository as the [build context](https:/
 
 ```console
 docker build \
-  --build-arg VERSION=1.5.10 \
-  --tag cisagov/gatherer:1.5.10 \
+  --build-arg VERSION=1.5.11 \
+  --tag cisagov/gatherer:1.5.11 \
   https://github.com/cisagov/gatherer.git#develop
 ```
 
@@ -236,9 +238,9 @@ Docker:
     docker buildx build \
       --file Dockerfile-x \
       --platform linux/amd64 \
-      --build-arg VERSION=1.5.10 \
+      --build-arg VERSION=1.5.11 \
       --output type=docker \
-      --tag cisagov/gatherer:1.5.10 .
+      --tag cisagov/gatherer:1.5.11 .
     ```
 
 ## Contributing ##

src/version.txt

@@ -1 +1 @@
-__version__ = "1.5.10"
+__version__ = "1.5.11"