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.

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

Reference cisagov/dotgov-data instead of GSA/data #49

Merged
merged 2 commits into from
Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ expects the secrets in a different location.
To run the `cisagov/pshtt_reporter` image via Docker:

```console
docker run cisagov/pshtt_reporter:1.2.1
docker run cisagov/pshtt_reporter:1.2.2
```

### Running with Docker Compose ###
Expand All @@ -43,7 +43,7 @@ docker run cisagov/pshtt_reporter:1.2.1

services:
pshtt_reporter:
image: cisagov/pshtt_reporter:1.2.1
image: cisagov/pshtt_reporter:1.2.2
volumes:
- type: bind
source: <your_log_dir>
Expand Down Expand Up @@ -89,7 +89,7 @@ environment variables. See the

services:
pshtt_reporter:
image: cisagov/pshtt_reporter:1.2.1
image: cisagov/pshtt_reporter:1.2.2
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/pshtt_reporter:1.2.1
docker pull cisagov/pshtt_reporter:1.2.2
```

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.2.1`).
`:1.2.2`).

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

```console
docker build \
--tag cisagov/pshtt_reporter:1.2.1 \
--tag cisagov/pshtt_reporter:1.2.2 \
https://github.com/cisagov/pshtt_reporter.git#develop
```

Expand Down Expand Up @@ -235,7 +235,7 @@ Docker:
--file Dockerfile-x \
--platform linux/amd64 \
--output type=docker \
--tag cisagov/pshtt_reporter:1.2.1 .
--tag cisagov/pshtt_reporter:1.2.2 .
```

## Contributing ##
Expand Down
2 changes: 1 addition & 1 deletion src/report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mkdir -p $SHARED_DIR/artifacts/reporting/pshtt_reports
# hosts to be evaluated for HTTPS compliance, since they are not
# required to satisfy BOD 18-01. For more information see here:
# https://https.cio.gov/guide/#are-federally-operated-certificate-revocation-services-crl-ocsp-also-required-to-move-to-https
wget https://raw.githubusercontent.com/GSA/data/master/dotgov-websites/ocsp-crl.csv \
wget https://raw.githubusercontent.com/cisagov/dotgov-data/main/dotgov-websites/ocsp-crl.csv \
-O $SHARED_DIR/artifacts/ocsp-crl.csv

# Generate agency reports
Expand Down
2 changes: 1 addition & 1 deletion src/report/https_scan_report.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ BOD 18-01 includes
practice only used internally. An exception is made for domains used
exclusively for Online Certificate Status Protocol (OCSP), which can
be excluded from the BOD 18-01 requirements by adding them to
\href{https://github.com/GSA/data/blob/master/dotgov-websites/ocsp-crl.csv}{this
\href{https://github.com/cisagov/dotgov-data/blob/main/dotgov-websites/ocsp-crl.csv}{this
CSV file}. Such domains appear in the table below followed by an
asterisk, and their scores \emph{are not} included as part of the BOD
18-01 compliance calculations.\\~\\
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.2.1"
__version__ = "1.2.2"