Skip to content

Commit

Permalink
adjust github location to cisagov repo
Browse files Browse the repository at this point in the history
  • Loading branch information
mmguero committed Oct 6, 2022
1 parent 3f21d2b commit 3b014a4
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
This project contains code from Idaho National Laboratory's Network Architecture Verification & Validation Tool Project
Github idaholab/network-architecture-verification-and-validation
Github cisagov/network-architecture-verification-and-validation
Licensed under BSD-3 License.


Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ The **NAVV** (**N**etwork **A**rchitecture **V**erification and **V**alidation)
* [Contact](#Contact)

[![PyPI Release](https://img.shields.io/pypi/v/navv)](https://pypi.python.org/pypi/navv/)
[![Docker Image](https://github.com/idaholab/network-architecture-verification-and-validation/workflows/navv-build-push-ghcr/badge.svg)](https://github.com/idaholab/network-architecture-verification-and-validation/actions)
[![Total Alerts](https://img.shields.io/lgtm/alerts/g/idaholab/network-architecture-verification-and-validation.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/idaholab/network-architecture-verification-and-validation/alerts/)
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/idaholab/network-architecture-verification-and-validation.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/idaholab/network-architecture-verification-and-validation/context:python)
[![Known Vulnerabilities](https://snyk.io/test/github/idaholab/network-architecture-verification-and-validation/badge.svg)](https://snyk.io/test/github/idaholab/network-architecture-verification-and-validation)
[![Docker Image](https://github.com/cisagov/network-architecture-verification-and-validation/workflows/navv-build-push-ghcr/badge.svg)](https://github.com/cisagov/network-architecture-verification-and-validation/actions)
[![Total Alerts](https://img.shields.io/lgtm/alerts/g/cisagov/network-architecture-verification-and-validation.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/cisagov/network-architecture-verification-and-validation/alerts/)
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/cisagov/network-architecture-verification-and-validation.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/cisagov/network-architecture-verification-and-validation/context:python)
[![Known Vulnerabilities](https://snyk.io/test/github/cisagov/network-architecture-verification-and-validation/badge.svg)](https://snyk.io/test/github/cisagov/network-architecture-verification-and-validation)

## <a name="Installation"></a>Installation

Expand All @@ -28,7 +28,7 @@ The recommended method for installing packages with `pip` is using [User Install

### <a name="InstallLatest"></a>Latest release

Download the [latest NAVV release from GitHub](https://github.com/idaholab/network-architecture-verification-and-validation/releases/latest). Either of the `.whl` [built distribution](https://packaging.python.org/glossary/#term-Built-Distribution) or the `.tar.gz` [source archive](https://packaging.python.org/glossary/#term-Source-Archive) release artifacts should suffice.
Download the [latest NAVV release from GitHub](https://github.com/cisagov/network-architecture-verification-and-validation/releases/latest). Either of the `.whl` [built distribution](https://packaging.python.org/glossary/#term-Built-Distribution) or the `.tar.gz` [source archive](https://packaging.python.org/glossary/#term-Source-Archive) release artifacts should suffice.

NAVV can then be installed via `pip`:

Expand All @@ -50,10 +50,10 @@ python3 -m pip install -U navv
NAVV can be installed via `pip` using `git`:

```shell
$ python3 -m pip install --user git+https://github.com/idaholab/network-architecture-verification-and-validation
Collecting git+https://github.com/idaholab/network-architecture-verification-and-validation
Cloning https://github.com/idaholab/network-architecture-verification-and-validation to /tmp/pip-req-build-pl6llgda
Running command git clone -q https://github.com/idaholab/network-architecture-verification-and-validation /tmp/pip-req-build-pl6llgda
$ python3 -m pip install --user git+https://github.com/cisagov/network-architecture-verification-and-validation
Collecting git+https://github.com/cisagov/network-architecture-verification-and-validation
Cloning https://github.com/cisagov/network-architecture-verification-and-validation to /tmp/pip-req-build-pl6llgda
Running command git clone -q https://github.com/cisagov/network-architecture-verification-and-validation /tmp/pip-req-build-pl6llgda
Installing build dependencies ... done
Successfully installed et-xmlfile-1.1.0 lxml-4.6.3 navv-3.0.0 netaddr-0.8.0 openpyxl-3.0.7 tqdm-4.61.1
Expand Down Expand Up @@ -255,7 +255,7 @@ See [`docker/README.md`](./docker/README.md) for setup and instructions for runn

## <a name="Footer"></a>Copyright

[NAVV](https://github.com/idaholab/network-architecture-verification-and-validation) is Copyright 2021 Battelle Energy Alliance, LLC, licensed under the BSD-3 Clause License.
[NAVV](https://github.com/cisagov/network-architecture-verification-and-validation) is Copyright 2021 Battelle Energy Alliance, LLC, licensed under the BSD-3 Clause License.

See [`LICENSE`](./LICENSE) for the terms of its release.

Expand All @@ -269,7 +269,7 @@ Developers, by contributing to this software project, you are agreeing to the fo
Idaho National Laboratory is a cutting edge research facility which is constantly producing high quality research and software. Feel free to take a look at our other software and scientific offerings at:

* [Primary Technology Offerings Page](https://www.inl.gov/inl-initiatives/technology-deployment)
* [Supported Open Source Software](https://github.com/idaholab)
* [Supported Open Source Software](https://github.com/cisagov)
* [Raw Experiment Open Source Software](https://github.com/IdahoLabResearch)
* [Unsupported Open Source Software](https://github.com/IdahoLabCuttingBoard)

Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ FROM ubuntu:22.04

LABEL maintainer="[email protected]"
LABEL org.opencontainers.image.authors='[email protected]'
LABEL org.opencontainers.image.url='https://github.com/idaholab/network-architecture-verification-and-validation'
LABEL org.opencontainers.image.documentation='https://github.com/idaholab/network-architecture-verification-and-validation/blob/master/README.md'
LABEL org.opencontainers.image.source='https://github.com/idaholab/network-architecture-verification-and-validation'
LABEL org.opencontainers.image.url='https://github.com/cisagov/network-architecture-verification-and-validation'
LABEL org.opencontainers.image.documentation='https://github.com/cisagov/network-architecture-verification-and-validation/blob/master/README.md'
LABEL org.opencontainers.image.source='https://github.com/cisagov/network-architecture-verification-and-validation'
LABEL org.opencontainers.image.vendor='Idaho National Laboratory'
LABEL org.opencontainers.image.title='idaholab/network-architecture-verification-and-validation'
LABEL org.opencontainers.image.title='cisagov/network-architecture-verification-and-validation'
LABEL org.opencontainers.image.description='The NAVV (Network Architecture Verification and Validation) tool'

ENV DEBIAN_FRONTEND noninteractive
Expand Down
12 changes: 6 additions & 6 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

## <a name="Build"></a>Building the Docker image

Run `./docker/build_docker.sh` to build the `ghcr.io/idaholab/network-architecture-verification-and-validation:latest` image. You can include `--force-rm --no-cache` to build the image from scratch without using any previously cached layers.
Run `./docker/build_docker.sh` to build the `ghcr.io/cisagov/network-architecture-verification-and-validation:latest` image. You can include `--force-rm --no-cache` to build the image from scratch without using any previously cached layers.

This build process doesn't require any previous building or configuration of the `navv` Python code: it's entirely self-contained.

Expand All @@ -17,7 +17,7 @@ $ ./docker/build_docker.sh --force-rm --no-cache
Sending build context to Docker daemon 6.873MB
Step 1/17 : FROM ubuntu:latest
Successfully tagged ghcr.io/idaholab/network-architecture-verification-and-validation:latest
Successfully tagged ghcr.io/cisagov/network-architecture-verification-and-validation:latest

$ docker images | head
REPOSITORY TAG IMAGE ID CREATED SIZE
Expand Down Expand Up @@ -65,7 +65,7 @@ Use the script `./docker/backup_docker.sh`:
```shell
$ /home/user/navv/docker/backup_docker.sh
Transfer navv-docker_20210219_114718_59a26a647a3f.tar.gz and navv-docker.sh to destination host
Import ghcr.io/idaholab/network-architecture-verification-and-validation:latest with docker load -i navv-docker_20210219_114718_59a26a647a3f.tar.gz
Import ghcr.io/cisagov/network-architecture-verification-and-validation:latest with docker load -i navv-docker_20210219_114718_59a26a647a3f.tar.gz
Run with navv-docker.sh
```
Expand All @@ -76,7 +76,7 @@ docker load -i navv-docker_20210219_114718_59a26a647a3f.tar.gz
7a8aada2513d: Loading layer [==================================================>] 6.878MB/6.878MB
5c42a13ea084: Loading layer [==================================================>] 42.98MB/42.98MB
b62a2ff84161: Loading layer [==================================================>] 341.5kB/341.5kB
Loaded image: ghcr.io/idaholab/network-architecture-verification-and-validation:latest
Loaded image: ghcr.io/cisagov/network-architecture-verification-and-validation:latest
```
Then use `navv-docker.sh` as described above.
Expand All @@ -90,7 +90,7 @@ $ mkdir ./dist
$ docker run --rm --entrypoint=/bin/bash \
-u $(id -u) \
-v $(pwd)/dist:/dist \
ghcr.io/idaholab/network-architecture-verification-and-validation:latest navv-build-for-export.sh
ghcr.io/cisagov/network-architecture-verification-and-validation:latest navv-build-for-export.sh
Collecting build
total 9.4M
Expand All @@ -104,6 +104,6 @@ total 9.4M
```
## <a name="Footer"></a>Copyright

[NAVV](https://github.com/idaholab/network-architecture-verification-and-validation) is Copyright 2021 Battelle Energy Alliance, LLC, licensed under the BSD-3 Clause License.
[NAVV](https://github.com/cisagov/network-architecture-verification-and-validation) is Copyright 2021 Battelle Energy Alliance, LLC, licensed under the BSD-3 Clause License.

See [`LICENSE`](./LICENSE) for the terms of its release.
2 changes: 1 addition & 1 deletion docker/backup_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fi
export SCRIPT_PATH="$($DIRNAME $($REALPATH -e "${BASH_SOURCE[0]}"))"

# default docker image name (can be overriden via NAVV_DOCKER_IMAGE env. var.)
NAVV_DOCKER_IMAGE="${NAVV_DOCKER_IMAGE:-ghcr.io/idaholab/network-architecture-verification-and-validation:latest}"
NAVV_DOCKER_IMAGE="${NAVV_DOCKER_IMAGE:-ghcr.io/cisagov/network-architecture-verification-and-validation:latest}"

# save tarball with image creation date and sha
DOCKER_BACKUP_FILENAME=navv-docker_$(date -d "$(docker inspect --format='{{.Created}}' "$NAVV_DOCKER_IMAGE")" +"%Y%m%d_%H%M%S")_$(docker images --no-trunc --quiet "$NAVV_DOCKER_IMAGE" | cut -d: -f2 | cut -c 1-12).tar.gz
Expand Down
2 changes: 1 addition & 1 deletion docker/build_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export SCRIPT_PATH="$($DIRNAME $($REALPATH -e "${BASH_SOURCE[0]}"))"

pushd "$SCRIPT_PATH"/.. >/dev/null 2>&1

docker build -f docker/Dockerfile -t ghcr.io/idaholab/network-architecture-verification-and-validation:latest "$@" .
docker build -f docker/Dockerfile -t ghcr.io/cisagov/network-architecture-verification-and-validation:latest "$@" .

popd >/dev/null 2>&1
2 changes: 1 addition & 1 deletion docker/navv-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ shopt -s nullglob
ENCODING="utf-8"

# default docker image name (can be overriden via NAVV_DOCKER_IMAGE env. var.)
NAVV_DOCKER_IMAGE="${NAVV_DOCKER_IMAGE:-ghcr.io/idaholab/network-architecture-verification-and-validation:latest}"
NAVV_DOCKER_IMAGE="${NAVV_DOCKER_IMAGE:-ghcr.io/cisagov/network-architecture-verification-and-validation:latest}"

# run navv -h to get help
function print_usage() {
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ author_email = [email protected]
description = Generate a spreadsheet for network traffic analysis from PCAP data and Zeek logs
long_description = file: README.md
long_description_content_type = text/markdown
url = https://github.com/idaholab/network-architecture-verification-and-validation
url = https://github.com/cisagov/network-architecture-verification-and-validation
project_urls =
Bug Tracker = https://github.com/idaholab/network-architecture-verification-and-validation/issues
Bug Tracker = https://github.com/cisagov/network-architecture-verification-and-validation/issues
classifiers =
Development Status :: 5 - Production/Stable
Environment :: Console
Expand Down

0 comments on commit 3b014a4

Please sign in to comment.