From 3cbd2d9bd4a3e4b137bc601b2307e2527f8d0fbc Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 12 Apr 2023 16:00:25 -0400 Subject: [PATCH 1/4] Bump version from 1.5.12 to 1.5.13 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 14f2309..4806930 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.12 +docker run cisagov/gatherer:1.5.13 ``` ### Running with Docker Compose ### @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.12 services: gatherer: - image: cisagov/gatherer:1.5.12 + image: cisagov/gatherer:1.5.13 volumes: - type: bind source: @@ -93,7 +93,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.12 + image: cisagov/gatherer:1.5.13 volumes: - type: bind source: @@ -130,7 +130,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/gatherer:1.5.12 + docker pull cisagov/gatherer:1.5.13 ``` 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.12`). +`:1.5.13`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.12`| An exact release version. | +|`cisagov/gatherer:1.5.13`| 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.12 \ - --tag cisagov/gatherer:1.5.12 \ + --build-arg VERSION=1.5.13 \ + --tag cisagov/gatherer:1.5.13 \ 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.12 \ + --build-arg VERSION=1.5.13 \ --output type=docker \ - --tag cisagov/gatherer:1.5.12 . + --tag cisagov/gatherer:1.5.13 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index da34e60..1d51ed9 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.12" +__version__ = "1.5.13" From cd911f0fd1623e20786bf5a1895f1570163dcce5 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 12 Apr 2023 16:00:41 -0400 Subject: [PATCH 2/4] Bump version from 1.5.13 to 1.5.13-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 4806930..a7b001b 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.13 +docker run cisagov/gatherer:1.5.13-rc.1 ``` ### Running with Docker Compose ### @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.13 services: gatherer: - image: cisagov/gatherer:1.5.13 + image: cisagov/gatherer:1.5.13-rc.1 volumes: - type: bind source: @@ -93,7 +93,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.13 + image: cisagov/gatherer:1.5.13-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.13 + docker pull cisagov/gatherer:1.5.13-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.13`). +`:1.5.13-rc.1`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.13`| An exact release version. | +|`cisagov/gatherer:1.5.13-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.13 \ - --tag cisagov/gatherer:1.5.13 \ + --build-arg VERSION=1.5.13-rc.1 \ + --tag cisagov/gatherer:1.5.13-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.13 \ + --build-arg VERSION=1.5.13-rc.1 \ --output type=docker \ - --tag cisagov/gatherer:1.5.13 . + --tag cisagov/gatherer:1.5.13-rc.1 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 1d51ed9..af9d39b 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.13" +__version__ = "1.5.13-rc.1" From e2c266d73530ee1fb368530503774d976144f882 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 12 Apr 2023 16:00:52 -0400 Subject: [PATCH 3/4] Upgrade to a Python 3.11.3 base image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 224724a..3f7314a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.1-slim-bullseye +FROM python:3.11.3-slim-bullseye ### # For a list of pre-defined annotation keys and value types see: From a5964dfcdd7dfe2640139ed51ec7577b40a68330 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Mon, 17 Apr 2023 09:59:19 -0400 Subject: [PATCH 4/4] Finalize version from 1.5.13-rc.1 to 1.5.13 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index a7b001b..4806930 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.13-rc.1 +docker run cisagov/gatherer:1.5.13 ``` ### Running with Docker Compose ### @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.13-rc.1 services: gatherer: - image: cisagov/gatherer:1.5.13-rc.1 + image: cisagov/gatherer:1.5.13 volumes: - type: bind source: @@ -93,7 +93,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.13-rc.1 + image: cisagov/gatherer:1.5.13 volumes: - type: bind source: @@ -130,7 +130,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/gatherer:1.5.13-rc.1 + docker pull cisagov/gatherer:1.5.13 ``` 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.13-rc.1`). +`:1.5.13`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.13-rc.1`| An exact release version. | +|`cisagov/gatherer:1.5.13`| 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.13-rc.1 \ - --tag cisagov/gatherer:1.5.13-rc.1 \ + --build-arg VERSION=1.5.13 \ + --tag cisagov/gatherer:1.5.13 \ 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.13-rc.1 \ + --build-arg VERSION=1.5.13 \ --output type=docker \ - --tag cisagov/gatherer:1.5.13-rc.1 . + --tag cisagov/gatherer:1.5.13 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index af9d39b..1d51ed9 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.5.13-rc.1" +__version__ = "1.5.13"