From 4957eb026d768f1380bae8f78085e02dfa834a05 Mon Sep 17 00:00:00 2001 From: Chris F <86795296+cfx47@users.noreply.github.com> Date: Thu, 30 May 2024 10:53:57 -0400 Subject: [PATCH 1/2] Update agencies.csv Update 4 Federal agency names to match the names of domains being pulled in other repos. --- src/include/agencies.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/agencies.csv b/src/include/agencies.csv index cec2fc3..72d853d 100644 --- a/src/include/agencies.csv +++ b/src/include/agencies.csv @@ -5,7 +5,7 @@ AMTRAK,AMTRAK Appalachian Regional Commission,APPRC Armed Forces Retirement Home,AFRH Barry Goldwater Scholarship and Excellence in Education Foundation,BGSF -Chemical Safety Board,CSB +U.S. Chemical Safety Board,CSB Christopher Columbus Fellowship Foundation,CCFF Civil Air Patrol,CAP Commodity Futures Trading Commission,CFTC @@ -36,7 +36,7 @@ Election Assistance Commission,EAC Environmental Protection Agency,EPA Equal Employment Opportunity Commission,EEOC Executive Office of the President,EOP -Export Import Bank of the U.S.,EXIM +Export-Import Bank of the United States,EXIM Farm Credit Administration,FCA Federal Communications Commission,FCC Federal Deposit Insurance Corporation,FDIC @@ -60,7 +60,7 @@ Institute of Museum and Library Services,IMLS Inter-American Foundation,IAF International Boundary and Water Commission,IBWC James Madison Memorial Fellowship Foundation,JMMFF -Japan-US Friendship Commission,JUSFC +Japan-U.S. Friendship Commission,JUSFC Legal Services Corporation,LSC Marine Mammal Commission,MMC Merit Systems Protection Board,MSPB @@ -118,5 +118,5 @@ U.S. Commission on Civil Rights,USCCR U.S. Department of Agriculture,USDA U.S. Nuclear Waste Technical Review Board,NWTRB U.S. Office of Special Counsel,OSC -U.S. Peace Corps,PC +Peace Corps,PC Vietnam Education Foundation,VEF From ea8dcc7356632564062ae8a2a8c8177384106d09 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Thu, 30 May 2024 16:01:02 -0400 Subject: [PATCH 2/2] Bump version from 1.3.6 to 1.3.7 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index aef8554..2ed4efc 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ expects the secrets in a different location. To run the `cisagov/saver` image via Docker: ```console -docker run cisagov/saver:1.3.6 +docker run cisagov/saver:1.3.7 ``` ### Running with Docker Compose ### @@ -46,7 +46,7 @@ docker run cisagov/saver:1.3.6 services: saver: - image: cisagov/saver:1.3.6 + image: cisagov/saver:1.3.7 volumes: - type: bind source: @@ -92,7 +92,7 @@ environment variables. See the services: trustymail_reporter: - image: cisagov/saver:1.3.6 + image: cisagov/saver:1.3.7 volumes: - type: bind source: @@ -129,7 +129,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/saver:1.3.6 + docker pull cisagov/saver:1.3.7 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -139,11 +139,11 @@ environment variables. See the The images of this container are tagged with [semantic versions](https://semver.org) of the underlying saver project that they containerize. It is recommended that most users use a version tag (e.g. -`:1.3.6`). +`:1.3.7`). | Image:tag | Description | |-----------|-------------| -|`cisagov/saver:1.3.6`| An exact release version. | +|`cisagov/saver:1.3.7`| An exact release version. | |`cisagov/saver:1.3`| The most recent release matching the major and minor version numbers. | |`cisagov/saver:1`| The most recent release matching the major version number. | |`cisagov/saver:edge` | The most recent image built from a merge into the `develop` branch of this repository. | @@ -206,8 +206,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=1.3.6 \ - --tag cisagov/saver:1.3.6 \ + --build-arg VERSION=1.3.7 \ + --tag cisagov/saver:1.3.7 \ https://github.com/cisagov/saver.git#develop ``` @@ -237,9 +237,9 @@ Docker: docker buildx build \ --file Dockerfile-x \ --platform linux/amd64 \ - --build-arg VERSION=1.3.6 \ + --build-arg VERSION=1.3.7 \ --output type=docker \ - --tag cisagov/saver:1.3.6 . + --tag cisagov/saver:1.3.7 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 75145de..5309a58 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.3.6" +__version__ = "1.3.7"