From 3ac5abd7ea4318c93eb42be7b35980f7f458e6f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Oct 2022 21:07:49 +0000 Subject: [PATCH 1/3] Bump python from 3.10.7-slim-bullseye to 3.11.0-slim-bullseye Bumps python from 3.10.7-slim-bullseye to 3.11.0-slim-bullseye. --- updated-dependencies: - dependency-name: python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a166d54..df79bf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG VERSION=unspecified -FROM python:3.10.7-slim-bullseye +FROM python:3.11.0-slim-bullseye ARG VERSION From a8d1313e30da5631ca37a582a48ccaba399e82fc Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 1 Nov 2022 09:47:45 -0400 Subject: [PATCH 2/3] Bump version from 1.5.7 to 1.5.8 --- README.md | 20 ++++++++++---------- src/version.txt | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 4a00b00..94753ab 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ expects the secrets in a different location. To run the `cisagov/gatherer` image via Docker: ```console -docker run cisagov/gatherer:1.5.7 +docker run cisagov/gatherer:1.5.8 ``` ### Running with Docker Compose ### @@ -45,7 +45,7 @@ docker run cisagov/gatherer:1.5.7 services: gatherer: - image: cisagov/gatherer:1.5.7 + image: cisagov/gatherer:1.5.8 volumes: - type: bind source: @@ -91,7 +91,7 @@ environment variables. See the services: gatherer: - image: cisagov/gatherer:1.5.7 + image: cisagov/gatherer:1.5.8 volumes: - type: bind source: @@ -128,7 +128,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/gatherer:1.5.7 + docker pull cisagov/gatherer:1.5.8 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -138,11 +138,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.7`). +`:1.5.8`). | Image:tag | Description | |-----------|-------------| -|`cisagov/gatherer:1.5.7`| An exact release version. | +|`cisagov/gatherer:1.5.8`| 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. | @@ -205,8 +205,8 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --build-arg VERSION=1.5.7 \ - --tag cisagov/gatherer:1.5.7 \ + --build-arg VERSION=1.5.8 \ + --tag cisagov/gatherer:1.5.8 \ https://github.com/cisagov/gatherer.git#develop ``` @@ -236,9 +236,9 @@ Docker: docker buildx build \ --file Dockerfile-x \ --platform linux/amd64 \ - --build-arg VERSION=1.5.7 \ + --build-arg VERSION=1.5.8 \ --output type=docker \ - --tag cisagov/gatherer:1.5.7 . + --tag cisagov/gatherer:1.5.8 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index f01291b..1cc9c18 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -1.5.7 +1.5.8 From fc2b8bf5672603dad161ccc25648c0d9a45f4e43 Mon Sep 17 00:00:00 2001 From: Jeremy Frasier Date: Tue, 1 Nov 2022 10:11:22 -0400 Subject: [PATCH 3/3] Correctly indent multi-line double-quoted string This is suddenly causing builds not to launch in GitHub Actions. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d860138..095b99b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ env: IMAGE_NAME: cisagov/gatherer PIP_CACHE_DIR: ~/.cache/pip PLATFORMS: "linux/amd64,linux/arm/v6,linux/arm/v7,\ - linux/arm64,linux/ppc64le,linux/s390x" + linux/arm64,linux/ppc64le,linux/s390x" PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit RUN_TMATE: ${{ secrets.RUN_TMATE }}