Skip to content

Commit

Permalink
refactor: updated references
Browse files Browse the repository at this point in the history
  • Loading branch information
davidallendj committed Dec 11, 2024
1 parent 94a1ea3 commit 83e6ae5
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
22 changes: 11 additions & 11 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ nfpms:
- archlinux
maintainer: "David J. Allen <allend@lanl.gov>"
description: "Magellan is a discovery tool for BMCs."
homepage: "https://www.openchami.org"
homepage: "https://www.davidallendj.org"
license: MIT
section: utils
priority: optional
Expand All @@ -75,9 +75,9 @@ nfpms:

dockers:
- image_templates:
- &amd64_linux_image ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}-amd64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}-amd64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-amd64
- &amd64_linux_image ghcr.io/davidallendj/{{.ProjectName}}:{{ .Tag }}-amd64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}-amd64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-amd64
use: buildx
build_flag_templates:
- "--pull"
Expand All @@ -93,9 +93,9 @@ dockers:
- CHANGELOG.md
- README.md
- image_templates:
- &arm64v8_linux_image ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}-arm64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}-arm64
- ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-arm64
- &arm64v8_linux_image ghcr.io/davidallendj/{{.ProjectName}}:{{ .Tag }}-arm64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}-arm64
- ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}-arm64
use: buildx
build_flag_templates:
- "--pull"
Expand All @@ -111,22 +111,22 @@ dockers:
goarch: arm64

docker_manifests:
- name_template: "ghcr.io/openchami/{{.ProjectName}}:latest"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:latest"
image_templates:
- *amd64_linux_image
- *arm64v8_linux_image

- name_template: "ghcr.io/openchami/{{.ProjectName}}:{{ .Tag }}"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:{{ .Tag }}"
image_templates:
- *amd64_linux_image
- *arm64v8_linux_image

- name_template: "ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}"
image_templates:
- *amd64_linux_image
- *arm64v8_linux_image

- name_template: "ghcr.io/openchami/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}"
- name_template: "ghcr.io/davidallendj/{{.ProjectName}}:{{ .Major }}.{{ .Minor }}"
image_templates:
- *amd64_linux_image
- *arm64v8_linux_image
Expand Down
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Miscellaneous

* Merge pull request #55 from OpenCHAMI/cacert-hotfix
* Merge pull request #55 from davidallendj/cacert-hotfix

## [0.1.4]

Expand All @@ -43,11 +43,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Miscellaneous

* Merge branch 'main' into minor-changes
* Merge pull request #50 from OpenCHAMI/container-build
* Merge pull request #51 from OpenCHAMI/minor-changes
* Merge pull request #52 from OpenCHAMI/minor-changes
* Merge pull request #53 from OpenCHAMI/minor-changes
* Merge pull request #54 from OpenCHAMI/update-readme
* Merge pull request #50 from davidallendj/container-build
* Merge pull request #51 from davidallendj/minor-changes
* Merge pull request #52 from davidallendj/minor-changes
* Merge pull request #53 from davidallendj/minor-changes
* Merge pull request #54 from davidallendj/update-readme
* Rearranged collect error to only show when not force updating
* Updated README.md and fixed outdated info
* magellan.sh: remove unused build helper function
Expand Down Expand Up @@ -82,7 +82,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Miscellaneous

* Merge pull request #49 from OpenCHAMI/add-types
* Merge pull request #49 from davidallendj/add-types

## [0.1.0]

Expand Down Expand Up @@ -263,7 +263,7 @@ Tidied up CLI flag names
### Added

* Adding dev container to standardize Linux build
* Merge pull request #1 from OpenCHAMI/rehome
* Merge pull request #1 from davidallendj/rehome

## [0.0.5] - 2023-11-02

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The `magellan` tool comes packed with a handleful of features for doing discover
- Simple network scanning
- Redfish-based inventory collection
- Redfish-based firmware updating
- Integration with OpenCHAMI SMD
- Integration with davidallendj SMD
- Write inventory data to JSON

See the [TODO](#todo) section for a list of soon-ish goals planned.
Expand Down Expand Up @@ -164,7 +164,7 @@ This will print a list of host information needed for the `collect` step. Set th
--timeout 5 \
--username $USERNAME \
--password $PASSWORD \
--host https://example.openchami.cluster:8443 \
--host https://example.davidallendj.cluster:8443 \
--output logs/
--cacert cacert.pem
```
Expand Down Expand Up @@ -205,7 +205,7 @@ The `magellan` tool has a `login` subcommand that works with the [`opaal`](https
export ACCESS_TOKEN=eyJhbGciOiJIUzI1NiIs...
```

Alternatively, if you are running the OpenCHAMI quickstart in the [deployment recipes](https://github.com/davidallendj/deployment-recipes), you can run the provided script to generate a token and set the environment variable that way.
Alternatively, if you are running the davidallendj quickstart in the [deployment recipes](https://github.com/davidallendj/deployment-recipes), you can run the provided script to generate a token and set the environment variable that way.

```bash
quickstart_dir=path/to/deployment/recipes/quickstart
Expand All @@ -224,7 +224,7 @@ docker pull ghcr.io/davidallendj/magellan:latest
Then, run either with the helper script found in `bin/magellan.sh` or the binary in the container:

```bash
docker run ghcr.io/openchami/magellan:latest /magellan.sh --scan "--subnet 172.16.0.0 --port 443 --timeout 3" --collect "--user admin --pass password --host http://vm01 --port 27779"
docker run ghcr.io/davidallendj/magellan:latest /magellan.sh --scan "--subnet 172.16.0.0 --port 443 --timeout 3" --collect "--user admin --pass password --host http://vm01 --port 27779"
# ... or ..
docker ghcr.io/openhami/magellan:latest /magellan scan --subnet 172.16.0.0 --subnet-mask 255.255.255.0
```
Expand Down
2 changes: 1 addition & 1 deletion emulator/rf-emulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ volumes:

services:
emulator:
image: openchami-rie:latest
image: davidallendj-rie:latest
container_name: rf-emulator
environment:
BMC_PORT: 5000
Expand Down
2 changes: 1 addition & 1 deletion emulator/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ if [ ! -d ${script_dir}/rf-emulator ]; then
fi

# build docker image and run with docker compose
docker build -t openchami-rie:latest -f ${script_dir}/Dockerfile ${script_dir}/rf-emulator
docker build -t davidallendj-rie:latest -f ${script_dir}/Dockerfile ${script_dir}/rf-emulator
docker compose -f ${script_dir}/rf-emulator.yml up

0 comments on commit 83e6ae5

Please sign in to comment.