From fc2a67ea41e332e202b076eb4bf65b880f11916c Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 31 Jan 2024 11:27:05 -0500 Subject: [PATCH 1/3] Bump version from 1.3.3 to 1.3.4 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 53b14e9..f77be98 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.3 +docker run cisagov/saver:1.3.4 ``` ### Running with Docker Compose ### @@ -46,7 +46,7 @@ docker run cisagov/saver:1.3.3 services: saver: - image: cisagov/saver:1.3.3 + image: cisagov/saver:1.3.4 volumes: - type: bind source: @@ -92,7 +92,7 @@ environment variables. See the services: trustymail_reporter: - image: cisagov/saver:1.3.3 + image: cisagov/saver:1.3.4 volumes: - type: bind source: @@ -129,7 +129,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/saver:1.3.3 + docker pull cisagov/saver:1.3.4 ``` 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.3`). +`:1.3.4`). | Image:tag | Description | |-----------|-------------| -|`cisagov/saver:1.3.3`| An exact release version. | +|`cisagov/saver:1.3.4`| 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.3 \ - --tag cisagov/saver:1.3.3 \ + --build-arg VERSION=1.3.4 \ + --tag cisagov/saver:1.3.4 \ 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.3 \ + --build-arg VERSION=1.3.4 \ --output type=docker \ - --tag cisagov/saver:1.3.3 . + --tag cisagov/saver:1.3.4 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index 7b1e312..f9e47b6 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -__version__ = "1.3.3" +__version__ = "1.3.4" From c414f2ff9c6895e06b609d847c007d40e23e50d5 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 31 Jan 2024 11:27:30 -0500 Subject: [PATCH 2/3] Upgrade to the latest version of Python --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 82112e4..ab71378 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.12.0-alpine +FROM python:3.12.1-alpine ### # For a list of pre-defined annotation keys and value types see: From 39a9d7e09d712bd8cd97e1e3246252ed4362ebf5 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Wed, 31 Jan 2024 12:33:32 -0500 Subject: [PATCH 3/3] Update VM dev distro email address --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ab71378..aebc2fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM python:3.12.1-alpine # # Note: Additional labels are added by the build workflow. ### -LABEL org.opencontainers.image.authors="vm-fusion-dev-group@trio.dhs.gov" +LABEL org.opencontainers.image.authors="vm-dev@gwe.cisa.dhs.gov" LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency" ###