From 8d848efa1ecba56c92f2a42bd0957ab2c2eabccc Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 8 Feb 2024 11:46:38 -0500 Subject: [PATCH 1/3] Change FED.US to lowercase Since Cameron changes all domains to lowercase in current-federal.csv, we should change the case here it. --- src/gather-domains.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gather-domains.sh b/src/gather-domains.sh index 3c32142..3bd0f69 100755 --- a/src/gather-domains.sh +++ b/src/gather-domains.sh @@ -47,7 +47,7 @@ cat $OUTPUT_DIR/current-federal.csv \ # analogous to .gov or .com. It is only present in current-federal as # an accident of the way the registrar treats it. ### -sed -i '/^FED\.US,.*/d' $OUTPUT_DIR/current-federal_modified.csv +sed -i '/^fed\.us,.*/d' $OUTPUT_DIR/current-federal_modified.csv ### # Remove all domains that belong to US Courts, since they are part of # the judicial branch and have asked us to stop scanning them. From 577e18c9143add8984920873685c6aa30ef5f99f Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 8 Feb 2024 11:50:55 -0500 Subject: [PATCH 2/3] Escape two periods in a regex Otherwise the periods will match anything. --- src/gather-domains.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gather-domains.sh b/src/gather-domains.sh index 3bd0f69..f56317e 100755 --- a/src/gather-domains.sh +++ b/src/gather-domains.sh @@ -66,7 +66,7 @@ sed -i '/[^,]*,[^,]*,U\.S\. Courts,/d;/[^,]*,[^,]*,The Supreme Court,/d' \ # HOR if and only if the domain is labeled "The Legislative Branch # (Congress)" in current-federal. ### -sed -i '/[^,]*,[^,]*,Library of Congress,/d;/[^,]*,[^,]*,Government Publishing Office,/d;/[^,]*,[^,]*,Congressional Office of Compliance,/d;/[^,]*,[^,]*,Stennis Center for Public Service,/d;/[^,]*,[^,]*,U.S. Capitol Police,/d;/[^,]*,[^,]*,Architect of the Capitol,/d' \ +sed -i '/[^,]*,[^,]*,Library of Congress,/d;/[^,]*,[^,]*,Government Publishing Office,/d;/[^,]*,[^,]*,Congressional Office of Compliance,/d;/[^,]*,[^,]*,Stennis Center for Public Service,/d;/[^,]*,[^,]*,U\.S\. Capitol Police,/d;/[^,]*,[^,]*,Architect of the Capitol,/d' \ $OUTPUT_DIR/current-federal_modified.csv ### From 9ad76665db162eb34116a5951d10d7619f3eba3f Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 8 Feb 2024 11:55:53 -0500 Subject: [PATCH 3/3] Bump version from 1.5.16 to 1.5.17 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c1c1c11..32e6945 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.17 ``` ### 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.17 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.17 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.17 ``` 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.17`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.16`| An exact release version. | +|`cisagov/gatherer:1.5.17`| 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.17 \ + --tag cisagov/gatherer:1.5.17 \ 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.17 \ --output type=docker \ - --tag cisagov/gatherer:1.5.16 . + --tag cisagov/gatherer:1.5.17 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 35ddfd4..b0c2f60 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.16" +__version__ = "1.5.17"