Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the latest cisagov/domain scan code #108

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Use the latest cisagov/domain scan code #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e081410
Bump version from 1.5.15 to 1.5.16
jsf9k Nov 26, 2023
d77a5e4
Bump version from 1.5.16 to 1.5.16-rc.1
jsf9k Nov 26, 2023
e663917
Temporarily use a non-default branch of cisagov/domain-scan
jsf9k Nov 26, 2023
6cc4fe9
Revert "Temporarily use a non-default branch of cisagov/domain-scan"
jsf9k Nov 29, 2023
bfbcead
Finalize version from 1.5.16-rc.1 to 1.5.16
jsf9k Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.15
docker run cisagov/gatherer:1.5.16
```

### Running with Docker Compose ###
Expand All @@ -47,7 +47,7 @@ docker run cisagov/gatherer:1.5.15

services:
gatherer:
image: cisagov/gatherer:1.5.15
image: cisagov/gatherer:1.5.16
volumes:
- type: bind
source: <your_output_dir>
Expand Down Expand Up @@ -93,7 +93,7 @@ environment variables. See the

services:
gatherer:
image: cisagov/gatherer:1.5.15
image: cisagov/gatherer:1.5.16
volumes:
- type: bind
source: <your_output_dir>
Expand Down Expand Up @@ -130,7 +130,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/gatherer:1.5.15
docker pull cisagov/gatherer:1.5.16
```

1. Recreate and run the container by following the [previous instructions](#running-with-docker).
Expand All @@ -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.15`).
`:1.5.16`).

| Image:tag | Description |
|-----------|-------------|
|`cisagov/gatherer:1.5.15`| An exact release version. |
|`cisagov/gatherer:1.5.16`| 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. |
Expand Down Expand Up @@ -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.15 \
--tag cisagov/gatherer:1.5.15 \
--build-arg VERSION=1.5.16 \
--tag cisagov/gatherer:1.5.16 \
https://github.com/cisagov/gatherer.git#develop
```

Expand Down Expand Up @@ -238,9 +238,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=1.5.15 \
--build-arg VERSION=1.5.16 \
--output type=docker \
--tag cisagov/gatherer:1.5.15 .
--tag cisagov/gatherer:1.5.16 .
```

## Contributing ##
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.5.15"
__version__ = "1.5.16"