From e081410e14b6f8de3137435b037128ea0e38b42b Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sun, 26 Nov 2023 10:58:12 -0500 Subject: [PATCH 1/5] Bump version from 1.5.15 to 1.5.16 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a83c59c..c1c1c11 100644 --- a/README.md +++ b/README.md @@ -34,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.15 +docker run cisagov/gatherer:1.5.16 ``` ### Running with Docker Compose ### @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.15 services: gatherer: - image: cisagov/gatherer:1.5.15 + image: cisagov/gatherer:1.5.16 volumes: - type: bind source: @@ -93,7 +93,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.15 + image: cisagov/gatherer:1.5.16 volumes: - type: bind source: @@ -130,7 +130,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/gatherer:1.5.15 + docker pull cisagov/gatherer:1.5.16 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -140,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.15`). +`:1.5.16`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.15`| An exact release version. | +|`cisagov/gatherer:1.5.16`| 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. | @@ -207,8 +207,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=1.5.15 \ - --tag cisagov/gatherer:1.5.15 \ + --build-arg VERSION=1.5.16 \ + --tag cisagov/gatherer:1.5.16 \ https://github.com/cisagov/gatherer.git#develop ``` @@ -238,9 +238,9 @@ Docker: docker buildx build \ --file Dockerfile-x \ --platform linux/amd64 \ - --build-arg VERSION=1.5.15 \ + --build-arg VERSION=1.5.16 \ --output type=docker \ - --tag cisagov/gatherer:1.5.15 . + --tag cisagov/gatherer:1.5.16 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 3723cfa..35ddfd4 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.15" +__version__ = "1.5.16" From d77a5e4ebc20a986f8f596773f06742b15cb0586 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sun, 26 Nov 2023 10:58:31 -0500 Subject: [PATCH 2/5] Bump version from 1.5.16 to 1.5.16-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 c1c1c11..e5deb89 100644 --- a/README.md +++ b/README.md @@ -34,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.16 +docker run cisagov/gatherer:1.5.16-rc.1 ``` ### Running with Docker Compose ### @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.16 services: gatherer: - image: cisagov/gatherer:1.5.16 + image: cisagov/gatherer:1.5.16-rc.1 volumes: - type: bind source: @@ -93,7 +93,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.16 + image: cisagov/gatherer:1.5.16-rc.1 volumes: - type: bind source: @@ -130,7 +130,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/gatherer:1.5.16 + docker pull cisagov/gatherer:1.5.16-rc.1 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -140,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.16`). +`:1.5.16-rc.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.16`| An exact release version. | +|`cisagov/gatherer:1.5.16-rc.1`| 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. | @@ -207,8 +207,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=1.5.16 \ - --tag cisagov/gatherer:1.5.16 \ + --build-arg VERSION=1.5.16-rc.1 \ + --tag cisagov/gatherer:1.5.16-rc.1 \ https://github.com/cisagov/gatherer.git#develop ``` @@ -238,9 +238,9 @@ Docker: docker buildx build \ --file Dockerfile-x \ --platform linux/amd64 \ - --build-arg VERSION=1.5.16 \ + --build-arg VERSION=1.5.16-rc.1 \ --output type=docker \ - --tag cisagov/gatherer:1.5.16 . + --tag cisagov/gatherer:1.5.16-rc.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 35ddfd4..31bb715 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.16" +__version__ = "1.5.16-rc.1" From e6639171652739015a684baf0f7c3ccc092ae4eb Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Sun, 26 Nov 2023 11:02:30 -0500 Subject: [PATCH 3/5] Temporarily use a non-default branch of cisagov/domain-scan This is being done to test the changes in cisagov/domain-scan#6. This change can be reverted once cisagov/domain-scan#6 is approved and merged. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 88974a8..630041f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,7 +70,7 @@ RUN pip3 install --no-cache-dir --upgrade \ ### SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN mkdir ${CISA_HOME}/domain-scan \ - && curl --location https://github.com/cisagov/domain-scan/tarball/master \ + && curl --location https://github.com/cisagov/domain-scan/tarball/improvement/get-rid-of-regex-warnings \ | tar --extract --gzip --strip-components 1 --directory ${CISA_HOME}/domain-scan/ RUN pip3 install --no-cache-dir --upgrade \ --requirement ${CISA_HOME}/domain-scan/requirements.txt From 6cc4fe92b06fa9cd2c4f9712af6c433211a31b70 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 29 Nov 2023 11:05:43 -0500 Subject: [PATCH 4/5] Revert "Temporarily use a non-default branch of cisagov/domain-scan" This reverts commit e6639171652739015a684baf0f7c3ccc092ae4eb. We can do this now that cisagov/domain-scan#6 has been merged. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 630041f..88974a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,7 +70,7 @@ RUN pip3 install --no-cache-dir --upgrade \ ### SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN mkdir ${CISA_HOME}/domain-scan \ - && curl --location https://github.com/cisagov/domain-scan/tarball/improvement/get-rid-of-regex-warnings \ + && curl --location https://github.com/cisagov/domain-scan/tarball/master \ | tar --extract --gzip --strip-components 1 --directory ${CISA_HOME}/domain-scan/ RUN pip3 install --no-cache-dir --upgrade \ --requirement ${CISA_HOME}/domain-scan/requirements.txt From bfbceadcff9e348771526c5a8412408af2ccf75e Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 29 Nov 2023 11:07:12 -0500 Subject: [PATCH 5/5] Finalize version from 1.5.16-rc.1 to 1.5.16 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e5deb89..c1c1c11 100644 --- a/README.md +++ b/README.md @@ -34,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.16-rc.1 +docker run cisagov/gatherer:1.5.16 ``` ### Running with Docker Compose ### @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.16-rc.1 services: gatherer: - image: cisagov/gatherer:1.5.16-rc.1 + image: cisagov/gatherer:1.5.16 volumes: - type: bind source: @@ -93,7 +93,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.16-rc.1 + image: cisagov/gatherer:1.5.16 volumes: - type: bind source: @@ -130,7 +130,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/gatherer:1.5.16-rc.1 + docker pull cisagov/gatherer:1.5.16 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -140,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.16-rc.1`). +`:1.5.16`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.16-rc.1`| An exact release version. | +|`cisagov/gatherer:1.5.16`| 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. | @@ -207,8 +207,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=1.5.16-rc.1 \ - --tag cisagov/gatherer:1.5.16-rc.1 \ + --build-arg VERSION=1.5.16 \ + --tag cisagov/gatherer:1.5.16 \ https://github.com/cisagov/gatherer.git#develop ``` @@ -238,9 +238,9 @@ Docker: docker buildx build \ --file Dockerfile-x \ --platform linux/amd64 \ - --build-arg VERSION=1.5.16-rc.1 \ + --build-arg VERSION=1.5.16 \ --output type=docker \ - --tag cisagov/gatherer:1.5.16-rc.1 . + --tag cisagov/gatherer:1.5.16 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 31bb715..35ddfd4 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.16-rc.1" +__version__ = "1.5.16"