summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorYuriy Andamasov <yuriy@vyos.io>2026-06-01 00:50:06 +0300
committerGitHub <noreply@github.com>2026-06-01 00:50:06 +0300
commit8f856a43361d1a14c7826ea0f4f2997c2b4f9535 (patch)
treed34ee18620e39942bcdb3edd130bcd6763477cdb /docker
parent95dcc2ffb48a65cd735e622d5d383b171593b4b8 (diff)
downloadvyos-build-8f856a43361d1a14c7826ea0f4f2997c2b4f9535.tar.gz
vyos-build-8f856a43361d1a14c7826ea0f4f2997c2b4f9535.zip
T8947: migrate remaining current→rolling residuals (rolling branch) (#1206)
* T8947: migrate remaining current→rolling residuals on rolling branch Post-1c the default branch is `rolling`, but several build-config values on this branch still referenced the old `current` repo path / codename / train identity. These are not cosmetic — they break the rolling ISO build: - docker/vyos-dev.list: apt source baked into vyos/vyos-build:rolling still pointed at repositories/current (Hit/Err on package builds). Now repositories/rolling + codename `rolling` (verified against live repo: Suite/Codename `rolling`, Components `main`). - data/defaults.toml: vyos_mirror → repositories/rolling; vyos_branch → rolling (build-vyos-image checks out vyos-1x at this branch — `current` no longer exists post-1c); release_train → rolling (apt pin codename + os-release identity). - data/live-build-config/archives/vyos-dev.pref.chroot: Pin codename n=rolling to match the repo. - data/versions: key current→rolling. build-vyos-image looks up version_mapping[git_branch]; git_branch is `rolling`, so the `current` key KeyErrored and the version fell back to 999.<timestamp>. - .github/config/smoketest-branches.json: rolling-train entry key current→rolling (looked up by branch name; was already 404ing on rolling) + mirror + container_image to rolling. os-release impact (intended): rolling images now report VERSION_CODENAME=rolling and "(rolling)" in PRETTY_NAME/VERSION. The -rolling version suffix is hardcoded and unaffected. Companion to Rollout 1c (T8943). Ref IS-504. 🤖 Generated by [robots](https://vyos.io) * T8947: finish current→rolling residuals in docs/Dockerfile examples Address adversarial-review findings (Codex) — stale current refs on the rolling branch outside build config: - .github/PULL_REQUEST_TEMPLATE.md: CONTRIBUTING link vyos-1x/blob/current → blob/rolling (was a broken link — vyos-1x renamed current→rolling in 1c). - README.md: "Development Branches" section described the default branch as `current`; updated to `rolling` (dropped the obsolete "may switch to main" note — the rename already happened, to rolling). - docker/Dockerfile: build-example comments vyos-build:current* → vyos-build:rolling*. Ref IS-504, companion to T8943. 🤖 Generated by [robots](https://vyos.io)
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile6
-rw-r--r--docker/vyos-dev.list2
2 files changed, 4 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cc7abad0..e4657690 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -31,11 +31,11 @@ RUN grep "VERSION_ID" /etc/os-release || (echo 'VERSION_ID="12"' >> /etc/os-rele
# arm32v7/
# arm64v8/
# Example bo byukd natively:
-# docker build -t vyos-build:current .
+# docker build -t vyos-build:rolling .
# Example to build on armhf:
-# docker build -t vyos-build:current-armhf --build-arg ARCH=arm32v7/ .
+# docker build -t vyos-build:rolling-armhf --build-arg ARCH=arm32v7/ .
# Example to build on arm64:
-# docker build -t vyos-build:current-arm64 --build-arg ARCH=arm64v8/ .
+# docker build -t vyos-build:rolling-arm64 --build-arg ARCH=arm64v8/ .
# On some versions of docker the emulation framework is not installed by default and
# you need to install qemu, qemu-user-static and register qemu inside docker manually using:
diff --git a/docker/vyos-dev.list b/docker/vyos-dev.list
index a6815200..a9a46ece 100644
--- a/docker/vyos-dev.list
+++ b/docker/vyos-dev.list
@@ -1 +1 @@
-deb [signed-by=/usr/share/keyrings/vyos-dev-archive-keyring.asc] https://packages.vyos.net/repositories/current current main
+deb [signed-by=/usr/share/keyrings/vyos-dev-archive-keyring.asc] https://packages.vyos.net/repositories/rolling rolling main