Skip to content

Commit

Permalink
Merge pull request #13 from stackhpc/fix-registry-settings
Browse files Browse the repository at this point in the history
feat!: update `github_default_registry`
  • Loading branch information
jackhodgkiss authored Dec 20, 2023
2 parents 072c57a + cd468e9 commit 453e69d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace: stackhpc
name: kayobe_workflows

# The version of the collection. Must be compatible with semantic versioning
version: 1.0.1
version: 1.0.2

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
2 changes: 1 addition & 1 deletion roles/github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ The following variables can be used to make small adjustments to the composition

`github_image_tag`: tag used to select kayobe image defaults to `latest`

`github_registry`: dictionary containing keys that correspond to `url`, `username`, `password` and `share` for the registry to be used by the workflows. Defaults to `ghcr.io` and uses the actors token to login. The key `share` is to indiciate if the registry is shared between environments.
`github_registry`: dictionary containing keys that correspond to `url`, `username`, `password` and `share` for the registry to be used by the workflows. By default it uses repository variables and settings `REGISTRY_URL`, `REGISTRY_USERNAME`, `REGISTRY_PASSWORD`. The key `share` is to indiciate if the registry is shared between environments.

`github_kayobe_base_image`: select the base image used when building the kayobe docker image. Default is `quay.io/centos/centos:stream8` supports OpenStack Wallaby, Xena and Yoga. Zed and higher would require `quay.io/rockylinux/rockylinux:9`.

Expand Down
6 changes: 3 additions & 3 deletions roles/github/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
github_default_registry:
url: ghcr.io
username: !unsafe "${{ github.actor }}"
password: !unsafe "${{ secrets.GITHUB_TOKEN }}"
url: !unsafe "${{ vars.REGISTRY_URL }}"
username: !unsafe "${{ vars.REGISTRY_USERNAME }}"
password: !unsafe "${{ secrets.REGISTRY_PASSWORD }}"
share: false

github_default_kayobe_arguments:
Expand Down

0 comments on commit 453e69d

Please sign in to comment.