Skip to content

Commit

Permalink
ci/build: fix default OCI coordinates quay.io/tinkerbell; TB org CI s…
Browse files Browse the repository at this point in the history
…ettings

- reword some comments
- quay.io/tinkerbell is the official base
- remove 'dev' tag from CI default
- use fixed
  - 'yes' for DockerHub login;
  - 'ARM64' tagged self-hosted runners for arm64 lk containers

Signed-off-by: Ricardo Pardini <[email protected]>
  • Loading branch information
rpardini committed Apr 30, 2024
1 parent cf69b9e commit ab6b609
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build-all-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ on:
workflow_dispatch:

env: # Global environment, passed to all jobs & all steps
# Unfortunately quay.io seems to go down a lot. Allow to use ghcr.io easily:
REGISTRY: "quay.io" # or quay.io, determines which will be logged-in to
# Default to quay.io, which is also the default for the CLI.
# Allow to use ghcr.io as an alternative, change & uncomment below:
REGISTRY: "quay.io" # or ghcr.io, determines which will be logged-in to
#HOOK_KERNEL_OCI_BASE: "ghcr.io/${{ github.repository_owner }}/tinkerbell/kernel-"
#HOOK_LK_CONTAINERS_OCI_BASE: "ghcr.io/${{ github.repository_owner }}/tinkerbell/linuxkit-"

# Apart from the quay/ghcr coordinates above (used for both pulling & pushing), we might also want to
# log in to DockerHub (with a read-only token) so we aren't hit by rate limits when pulling the linuxkit pkgs.
# To do so, set the secret DOCKER_USERNAME and DOCKER_PASSWORD in the repo secrets, and set the below to yes.
LOGIN_TO_DOCKERHUB: "${{ github.repository_owner == 'rpardini' && 'yes' || 'no' }}"
LOGIN_TO_DOCKERHUB: "yes"

HOOK_VERSION: "0.9.0-alpha1-build-${{github.run_number}}" # Use a forced Hook version

# Which flavors to build? space separated list, must match one of the TAG='s in flavors (this is used by matrix_prep job in gha-matrix command)
CI_TAGS: "standard dev armbian-sbc armbian-uefi lts"
CI_TAGS: "standard armbian-sbc armbian-uefi lts" # 'dev' is not included

# GHA runner configuration. See bash/json-matrix.sh for more details.
# Here we use a GHA conditional on the organization name to only use those self-hosted runners on a specific organization
CI_RUNNER_LK_CONTAINERS_ARM64: "${{ github.repository_owner == 'armsurvivors' && 'ARM64' || '' }}" # Use a self-hosted runner with the "ARM64" tag for the ARM64 builds of LK containers
CI_RUNNER_LK_CONTAINERS_ARM64: "ARM64" # Use a self-hosted runner with the "ARM64" tag for the ARM64 builds of LK containers

jobs:

Expand Down
6 changes: 2 additions & 4 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ parse_command_line_arguments "${@}" # which fills the above vars & exports the k
# From here on, no more $1 ${1} or similar. We've parsed it all into CLI_PARSED_CMDLINE_PARAMS (already exported in environment) or CLI_NON_PARAM_ARGS

### Configuration
#declare -g HOOK_KERNEL_OCI_BASE="${HOOK_KERNEL_OCI_BASE:-"ghcr.io/rpardini/tinkerbell/kernel-"}"
#declare -g HOOK_LK_CONTAINERS_OCI_BASE="${HOOK_LK_CONTAINERS_OCI_BASE:-"ghcr.io/rpardini/tinkerbell/linuxkit-"}"
declare -g HOOK_KERNEL_OCI_BASE="${HOOK_KERNEL_OCI_BASE:-"quay.io/tinkerbellrpardini/kernel-"}"
declare -g HOOK_LK_CONTAINERS_OCI_BASE="${HOOK_LK_CONTAINERS_OCI_BASE:-"quay.io/tinkerbellrpardini/linuxkit-"}"
declare -g HOOK_KERNEL_OCI_BASE="${HOOK_KERNEL_OCI_BASE:-"quay.io/tinkerbell/kernel-"}"
declare -g HOOK_LK_CONTAINERS_OCI_BASE="${HOOK_LK_CONTAINERS_OCI_BASE:-"quay.io/tinkerbell/linuxkit-"}"

declare -g SKOPEO_IMAGE="${SKOPEO_IMAGE:-"quay.io/skopeo/stable:latest"}"

Expand Down

0 comments on commit ab6b609

Please sign in to comment.