From f1fd307f3d05668273c0503ee98329687a76586e Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Wed, 15 Jan 2025 12:37:37 -0500 Subject: [PATCH 1/2] Restore support for dropped platforms Now that we are installing the `cryptography` package through the `py3-cryptography` system package we should be able to support any platforms that the package does. This means we can restore support for the `linux/arm/v6`, `linux/ppc64le`, and `linux/s390x` platforms. --- .github/workflows/build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94f8efc..e8d8c27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -425,17 +425,14 @@ jobs: context: . file: ./Dockerfile-x labels: ${{ needs.prepare.outputs.labels }} - # We have dropped support for the linux/arm/v6, linux/ppc64le, and - # linux/s390x platforms until the run time for the build-push-all job can get - # below the six hour limit that exists for GitHub Actions runners. This could - # either be through some kind of optimization, when we matrix out the build - # so each platform runs on its own runner, or if we start using our own - # runners that have a higher time limit. Please see #150 for tracking. platforms: | linux/386 linux/amd64 + linux/arm/v6 linux/arm/v7 linux/arm64/v8 + linux/ppc64le + linux/s390x # Uncomment the following option if you are building an image for use # on Google Cloud Run or AWS Lambda. The current default image output # is unable to run on either. Please see the following issue for more From d26a1de349fbd67a4adf1f45987df4f7d79e39cf Mon Sep 17 00:00:00 2001 From: Nicholas McDonnell <50747025+mcdonnnj@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:01:37 -0500 Subject: [PATCH 2/2] Bump version from 0.3.0-rc.2 to 0.3.0-rc.3 --- README.md | 16 ++++++++-------- src/version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index a7d5022..e96a555 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ hosted [here](https://www.dhs.gov/code.json). To run the `cisagov/code-gov-update` image via Docker: ```console -docker run cisagov/code-gov-update:0.3.0-rc.2 +docker run cisagov/code-gov-update:0.3.0-rc.3 ``` ### Running with Docker Compose ### @@ -44,7 +44,7 @@ docker run cisagov/code-gov-update:0.3.0-rc.2 services: update: - image: cisagov/code-gov-update:0.3.0-rc.2 + image: cisagov/code-gov-update:0.3.0-rc.3 init: true environment: - AWS_CONFIG_FILE=path/to/aws_config @@ -92,7 +92,7 @@ environment variables. See the services: update: - image: cisagov/code-gov-update:0.3.0-rc.2 + image: cisagov/code-gov-update:0.3.0-rc.3 init: true secrets: - source: aws_config @@ -131,7 +131,7 @@ environment variables. See the 1. Pull the new image: ```console - docker pull cisagov/code-gov-update:0.3.0-rc.2 + docker pull cisagov/code-gov-update:0.3.0-rc.3 ``` 1. Recreate and run the container by following the [previous instructions](#running-with-docker). @@ -170,11 +170,11 @@ and then update dependencies as you would above. The images of this container are tagged with [semantic versions](https://semver.org) of the underlying example project that they containerize. It is recommended that most users use a version tag (e.g. -`:0.3.0-rc.2`). +`:0.3.0-rc.3`). | Image:tag | Description | |-----------|-------------| -|`cisagov/code-gov-update:0.3.0-rc.2`| An exact release version. | +|`cisagov/code-gov-update:0.3.0-rc.3`| An exact release version. | |`cisagov/code-gov-update:0.3`| The most recent release matching the major and minor version numbers. | |`cisagov/code-gov-update:0`| The most recent release matching the major version number. | |`cisagov/code-gov-update:edge` | The most recent image built from a merge into the `develop` branch of this repository. | @@ -239,7 +239,7 @@ Build the image locally using this git repository as the [build context](https:/ ```console docker build \ - --tag cisagov/code-gov-update:0.3.0-rc.2 \ + --tag cisagov/code-gov-update:0.3.0-rc.3 \ https://github.com/cisagov/code-gov-update.git#develop ``` @@ -270,7 +270,7 @@ Docker: --file Dockerfile-x \ --platform linux/amd64 \ --output type=docker \ - --tag cisagov/code-gov-update:0.3.0-rc.2 . + --tag cisagov/code-gov-update:0.3.0-rc.3 . ``` ## Contributing ## diff --git a/src/version.txt b/src/version.txt index c23d448..c60a9cb 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -0.3.0-rc.2 +0.3.0-rc.3