Skip to content

Commit

Permalink
Merge pull request #69 from cisagov/improvement/use-latest-pshtt
Browse files Browse the repository at this point in the history
Use the latest version of pshtt
  • Loading branch information
jsf9k authored Dec 5, 2022
2 parents a9268e0 + 7e81962 commit 9acc1c3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN pip install --no-cache-dir --upgrade pip setuptools
# the file. (trustymail imports only in the scan function, so it
# isn't required here.)
###
RUN pip install --no-cache-dir --upgrade pshtt==0.6.6
RUN pip install --no-cache-dir --upgrade pshtt==0.6.9

###
# Install domain-scan
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ expects the secrets in a different location.
To run the `cisagov/scanner` image via Docker:

```console
docker run cisagov/scanner:1.3.0
docker run cisagov/scanner:1.3.1
```

### Running with Docker Compose ###
Expand All @@ -45,7 +45,7 @@ docker run cisagov/scanner:1.3.0

services:
scanner:
image: cisagov/scanner:1.3.0
image: cisagov/scanner:1.3.1
volumes:
- type: bind
source: <your_log_dir>
Expand Down Expand Up @@ -89,7 +89,7 @@ environment variables. See the
services:
scanner:
image: cisagov/scanner:1.3.0
image: cisagov/scanner:1.3.1
volumes:
- type: bind
source: <your_log_dir>
Expand Down Expand Up @@ -126,7 +126,7 @@ environment variables. See the
1. Pull the new image:

```console
docker pull cisagov/scanner:1.3.0
docker pull cisagov/scanner:1.3.1
```

1. Recreate and run the container by following the [previous instructions](#running-with-docker).
Expand All @@ -136,11 +136,11 @@ environment variables. See the
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.
`:1.3.0`).
`:1.3.1`).

| Image:tag | Description |
|-----------|-------------|
|`cisagov/scanner:1.3.0`| An exact release version. |
|`cisagov/scanner:1.3.1`| An exact release version. |
|`cisagov/scanner:1.3`| The most recent release matching the major and minor version numbers. |
|`cisagov/scanner:1`| The most recent release matching the major version number. |
|`cisagov/scanner:edge` | The most recent image built from a merge into the `develop` branch of this repository. |
Expand Down Expand Up @@ -200,8 +200,8 @@ Build the image locally using this git repository as the [build context](https:/

```console
docker build \
--build-arg VERSION=1.3.0 \
--tag cisagov/scanner:1.3.0 \
--build-arg VERSION=1.3.1 \
--tag cisagov/scanner:1.3.1 \
https://github.com/cisagov/scanner.git#develop
```

Expand Down Expand Up @@ -231,9 +231,9 @@ Docker:
docker buildx build \
--file Dockerfile-x \
--platform linux/amd64 \
--build-arg VERSION=1.3.0 \
--build-arg VERSION=1.3.1 \
--output type=docker \
--tag cisagov/scanner:1.3.0 .
--tag cisagov/scanner:1.3.1 .
```

## Contributing ##
Expand Down
2 changes: 1 addition & 1 deletion src/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.3.0"
__version__ = "1.3.1"

0 comments on commit 9acc1c3

Please sign in to comment.