From 40a48a3ee44d23579f79f45898a0005d7aab4288 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 23 Aug 2025 15:38:23 +0000 Subject: [PATCH 1/3] Initial plan From c98099194d3bcd0815561cebf700860d74784ac4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 23 Aug 2025 15:44:08 +0000 Subject: [PATCH 2/3] Fix circular dependency in workflow file_host usage Co-authored-by: aparcar <16000931+aparcar@users.noreply.github.com> --- .github/workflows/containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 8da0440..4eed138 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -144,7 +144,7 @@ jobs: echo "version_path=${VERSION_PATH:-snapshots}" >> "$GITHUB_OUTPUT" echo "run_setup=${RUN_SETUP:-0}" >> "$GITHUB_OUTPUT" - FILE_HOST=${{ needs.generate_matrix.outputs.file_host }} + FILE_HOST=${{ github.event.inputs.file_host }} echo "file_host=${FILE_HOST:-mirror-03.infra.openwrt.org}" >> "$GITHUB_OUTPUT" push-imagebuilder-container: From a8eacfa74d8cb5ce804b395c95ec035874f7b12d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 23 Aug 2025 15:44:57 +0000 Subject: [PATCH 3/3] Add documentation for rebuilding missing containers Co-authored-by: aparcar <16000931+aparcar@users.noreply.github.com> --- REBUILD_INSTRUCTIONS.md | 50 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 REBUILD_INSTRUCTIONS.md diff --git a/REBUILD_INSTRUCTIONS.md b/REBUILD_INSTRUCTIONS.md new file mode 100644 index 0000000..bd1bea7 --- /dev/null +++ b/REBUILD_INSTRUCTIONS.md @@ -0,0 +1,50 @@ +# Instructions for Rebuilding Missing Containers + +This document explains how to rebuild missing containers like the reported `ramips-mt7621-v23.05.6` container. + +## The Issue + +The container `ghcr.io/openwrt/imagebuilder:ramips-mt7621-v23.05.6` was missing due to a workflow issue that prevented manual container builds from working correctly. + +## The Fix + +Fixed a circular dependency in `.github/workflows/containers.yml` where the `generate_matrix` job was trying to use its own output for `file_host` instead of the workflow input. + +## How to Rebuild a Missing Container + +To rebuild the missing `ramips-mt7621-v23.05.6` container: + +1. Go to the [Actions tab](https://github.com/openwrt/docker/actions/workflows/containers.yml) +2. Click "Run workflow" +3. Fill in the parameters: + - **ref**: `v23.05.6` + - **target**: `ramips/mt7621` + - **file_host**: (leave empty for default) + - **prefix**: (leave empty for default) +4. Click "Run workflow" + +This will build and push the container to `ghcr.io/openwrt/imagebuilder:ramips-mt7621-v23.05.6`. + +## General Pattern + +For any missing container `TARGET-VERSION`: +- **ref**: The version (e.g., `v23.05.6`, `main`) +- **target**: The target architecture (e.g., `ramips/mt7621`, `x86/64`) + +The resulting container will be tagged as: +- `ghcr.io/openwrt/imagebuilder:TARGET-VERSION` +- `ghcr.io/openwrt/imagebuilder:TARGET-REF` (e.g., `ramips-mt7621-v23.05.6`) + +## Testing + +After the workflow completes successfully, you can test the container: + +```bash +podman run -it ghcr.io/openwrt/imagebuilder:ramips-mt7621-v23.05.6 +``` + +Inside the container, run: +```bash +./setup.sh +make image PROFILE=generic +``` \ No newline at end of file