Skip to content

Commit

Permalink
Merge pull request #180 from cisagov/improvement/restore_platform_sup…
Browse files Browse the repository at this point in the history
…port

Restore support for disabled platforms
  • Loading branch information
mcdonnnj authored Jan 23, 2025
2 parents 7c40a2f + d26a1de commit 223712e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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. |
Expand Down Expand Up @@ -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
```

Expand Down Expand Up @@ -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 ##
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0-rc.2
0.3.0-rc.3

0 comments on commit 223712e

Please sign in to comment.