From d05c335331130cfe150283faf76628d6fa763a9d Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 5 Dec 2022 12:22:50 -0500 Subject: [PATCH 1/4] Bump version from 1.3.0 to 1.3.1 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 30d6a89..45ac698 100644 --- a/README.md +++ b/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.0 +docker run cisagov/scanner:1.3.1 ``` ### Running with Docker Compose ### @@ -45,7 +45,7 @@ docker run cisagov/scanner:1.3.0 services: scanner: - image: cisagov/scanner:1.3.0 + image: cisagov/scanner:1.3.1 volumes: - type: bind source: @@ -89,7 +89,7 @@ environment variables. See the services: scanner: - image: cisagov/scanner:1.3.0 + image: cisagov/scanner:1.3.1 volumes: - type: bind source: @@ -126,7 +126,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/scanner:1.3.0 + docker pull cisagov/scanner:1.3.1 ``` 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.0`). +`:1.3.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/scanner:1.3.0`| An exact release version. | +|`cisagov/scanner:1.3.1`| 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.0 \ - --tag cisagov/scanner:1.3.0 \ + --build-arg VERSION=1.3.1 \ + --tag cisagov/scanner:1.3.1 \ 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.0 \ + --build-arg VERSION=1.3.1 \ --output type=docker \ - --tag cisagov/scanner:1.3.0 . + --tag cisagov/scanner:1.3.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 67bc602..9c73af2 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.3.0" +__version__ = "1.3.1" From ca1ac133eb0cdd7d7c26b1d68ab49b188782459b Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 5 Dec 2022 12:23:02 -0500 Subject: [PATCH 2/4] Bump version from 1.3.1 to 1.3.1-rc.1 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 45ac698..7a77ab4 100644 --- a/README.md +++ b/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.1 +docker run cisagov/scanner:1.3.1-rc.1 ``` ### Running with Docker Compose ### @@ -45,7 +45,7 @@ docker run cisagov/scanner:1.3.1 services: scanner: - image: cisagov/scanner:1.3.1 + image: cisagov/scanner:1.3.1-rc.1 volumes: - type: bind source: @@ -89,7 +89,7 @@ environment variables. See the services: scanner: - image: cisagov/scanner:1.3.1 + image: cisagov/scanner:1.3.1-rc.1 volumes: - type: bind source: @@ -126,7 +126,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/scanner:1.3.1 + docker pull cisagov/scanner:1.3.1-rc.1 ``` 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.1`). +`:1.3.1-rc.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/scanner:1.3.1`| An exact release version. | +|`cisagov/scanner:1.3.1-rc.1`| 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.1 \ - --tag cisagov/scanner:1.3.1 \ + --build-arg VERSION=1.3.1-rc.1 \ + --tag cisagov/scanner:1.3.1-rc.1 \ 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.1 \ + --build-arg VERSION=1.3.1-rc.1 \ --output type=docker \ - --tag cisagov/scanner:1.3.1 . + --tag cisagov/scanner:1.3.1-rc.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 9c73af2..d5b95eb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.3.1" +__version__ = "1.3.1-rc.1" From 349cbddfd13a6398a2546c9612fed6b8bad55e5f Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 5 Dec 2022 12:23:09 -0500 Subject: [PATCH 3/4] Use latest pshtt --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c453e4c..5a6d8ee 100644 --- a/Dockerfile +++ b/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.6 +RUN pip install --no-cache-dir --upgrade pshtt==0.6.9 ### # Install domain-scan From 7e81962250f5f86d5acc37fa70487a888a341bbd Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 5 Dec 2022 13:16:06 -0500 Subject: [PATCH 4/4] Finalize version from 1.3.1-rc.1 to 1.3.1 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 7a77ab4..45ac698 100644 --- a/README.md +++ b/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.1-rc.1 +docker run cisagov/scanner:1.3.1 ``` ### Running with Docker Compose ### @@ -45,7 +45,7 @@ docker run cisagov/scanner:1.3.1-rc.1 services: scanner: - image: cisagov/scanner:1.3.1-rc.1 + image: cisagov/scanner:1.3.1 volumes: - type: bind source: @@ -89,7 +89,7 @@ environment variables. See the services: scanner: - image: cisagov/scanner:1.3.1-rc.1 + image: cisagov/scanner:1.3.1 volumes: - type: bind source: @@ -126,7 +126,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/scanner:1.3.1-rc.1 + docker pull cisagov/scanner:1.3.1 ``` 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.1-rc.1`). +`:1.3.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/scanner:1.3.1-rc.1`| An exact release version. | +|`cisagov/scanner:1.3.1`| 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.1-rc.1 \ - --tag cisagov/scanner:1.3.1-rc.1 \ + --build-arg VERSION=1.3.1 \ + --tag cisagov/scanner:1.3.1 \ 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.1-rc.1 \ + --build-arg VERSION=1.3.1 \ --output type=docker \ - --tag cisagov/scanner:1.3.1-rc.1 . + --tag cisagov/scanner:1.3.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index d5b95eb..9c73af2 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.3.1-rc.1" +__version__ = "1.3.1"