Skip to content
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
23 changes: 17 additions & 6 deletions .github/workflows/build-hub-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,15 @@ on:
type: boolean
default: false
bigfred_oci_tag:
description: BigFred hub OCI tag (master | latest-release | v*)
description: BigFred GitHub ref (master | latest-release | v*)
type: string
default: latest-release
microinit_oci_tag:
description: microinit PID 1 OCI tag (main | sha-<7>)
description: microinit GitHub ref (main | sha-<7> | v*)
type: string
default: main
micronet_oci_tag:
description: micronet GitHub ref (main | sha-<7> | v*)
type: string
default: main
microdns_oci_tag:
Expand All @@ -29,7 +33,6 @@ on:

permissions:
contents: read
packages: read

concurrency:
group: build-hub-os-${{ github.ref }}
Expand All @@ -45,6 +48,7 @@ jobs:
MAKEFLAGS: -j$(( $(nproc) ))
BIGFRED_OCI_TAG: ${{ inputs.bigfred_oci_tag }}
MICROINIT_OCI_TAG: ${{ inputs.microinit_oci_tag }}
MICRONET_OCI_TAG: ${{ inputs.micronet_oci_tag }}
MICRODNS_OCI_TAG: ${{ inputs.microdns_oci_tag }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -105,7 +109,12 @@ jobs:
run: make -C apps test

- name: Build hub OS image
run: make -C os image BIGFRED_OCI_TAG="${BIGFRED_OCI_TAG}" MICROINIT_OCI_TAG="${MICROINIT_OCI_TAG}" MICRODNS_OCI_TAG="${MICRODNS_OCI_TAG}"
run: |
make -C os image \
BIGFRED_OCI_TAG="${BIGFRED_OCI_TAG}" \
MICROINIT_OCI_TAG="${MICROINIT_OCI_TAG}" \
MICRONET_OCI_TAG="${MICRONET_OCI_TAG}" \
MICRODNS_OCI_TAG="${MICRODNS_OCI_TAG}"

- name: Save host toolchain to cache
if: success()
Expand Down Expand Up @@ -133,8 +142,10 @@ jobs:
echo ""
echo "- Run: \`${{ github.run_number }}\`"
echo "- Commit: \`${{ github.sha }}\`"
echo "- BigFred OCI tag: \`${{ inputs.bigfred_oci_tag }}\`"
echo "- microinit OCI tag: \`${{ inputs.microinit_oci_tag }}\`"
echo "- BigFred ref: \`${{ inputs.bigfred_oci_tag }}\`"
echo "- microinit ref: \`${{ inputs.microinit_oci_tag }}\`"
echo "- micronet ref: \`${{ inputs.micronet_oci_tag }}\`"
echo "- microdns ref: \`${{ inputs.microdns_oci_tag }}\`"
echo "- Artifact: \`bigfred-hub-nvme-${{ github.run_number }}\`"
echo ""
echo '```'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ apps/prepare-nvme/target/
go/
os/.cache/
.cache/
.ci-github/
.npm/
.wget-hsts
5 changes: 4 additions & 1 deletion apps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ make -C apps clean
|-----|------|------|
| `bigfred-os-ui` | Go | Hub admin web UI (logs, services) |
| `rotate-hub-logs` | Go | Log rotation under `/data/logs` |
| `configure-ethernet` | Go | One-shot Ethernet `up` + `check` for microinit liveness |
| `prepare-nvme` | Rust | Migrate `/data` to NVMe (GPT via gptman) and remount |

Network tools (`configure-ethernet`, `configure-dhcp`) ship via Buildroot package
`package/micronet` (OCI from [dcc-bigfred/micronet](https://github.com/dcc-bigfred/micronet)),
not under `apps/`.

Init/PID 1 is **microinit** (OCI package), not under `apps/`. The SysV-style
`shutdown` CLI ships with that same OCI bundle (`/usr/sbin/shutdown`).

Expand Down
25 changes: 0 additions & 25 deletions apps/configure-ethernet/Makefile

This file was deleted.

65 changes: 0 additions & 65 deletions apps/configure-ethernet/README.md

This file was deleted.

Loading