From edba76c012fbc563eb7d3efb60a6acc82a041a58 Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Wed, 14 Sep 2022 11:46:09 +0200 Subject: [PATCH] Use ghcr.io/flatcar, there are no redirects The GitHub org rename also moved the ghcr.io container image repo but in contrast to git repos, there are no redirects! --- README.md | 8 ++++---- ci-automation/README.md | 2 +- ci-automation/ci-config.env | 4 ++-- ci-automation/packages-tag.sh | 2 +- ci-automation/packages.sh | 2 +- ci-automation/release.sh | 2 +- ci-automation/sdk_bootstrap.sh | 2 +- sdk_container/.repo/manifests/mantle-container | 2 +- sdk_lib/sdk_container_common.sh | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 671cfd7e2b..22f2ca9bd2 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,8 @@ In standalone mode, the SDK is just another Docker container. Interaction with t * Check the list of available versions and pick a version to use. The SDK Major versions correspond to Flatcar Major release versions. List of images: `https://github.com/orgs/flatcar-linux/packages/container/package/flatcar-sdk-all` For the purpose of this example we'll use version `3033.0.0`. -* Fetch the container image: `docker pull ghcr.io/flatcar-linux/flatcar-sdk-all:3033.0.0` -* Start the image in interactive (tty) mode: `docker run -ti ghcr.io/flatcar-linux/flatcar-sdk-all:3033.0.0` +* Fetch the container image: `docker pull ghcr.io/flatcar/flatcar-sdk-all:3033.0.0` +* Start the image in interactive (tty) mode: `docker run -ti ghcr.io/flatcar/flatcar-sdk-all:3033.0.0` You are now inside the SDK container (the hostname will likely differ): `sdk@f236fda982a4 ~/trunk/src/scripts $` * Initialise the SDK in self-contained mode. This needs to be done once per container and will check out the scripts, coreos-overlay, and portage-stable repositories into the container. @@ -78,7 +78,7 @@ In order to build OS images (via `./build_image` and `./image_to_vm`) the SDK to This is necessary because the SDK currently employs loop devices to create and to partition OS images. To start a container in privileged mode with `/dev` available use: -* `docker run -ti --privileged -v /dev:/dev ghcr.io/flatcar-linux/flatcar-sdk-all:3033.0.0` +* `docker run -ti --privileged -v /dev:/dev ghcr.io/flatcar/flatcar-sdk-all:3033.0.0` ## Integrated mode @@ -107,7 +107,7 @@ Subsequent calls to `./run_sdk_container` will re-use the container (as long as Check out `docker container ls --all` and you'll see something like ``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -19ea3b6d00ad ghcr.io/flatcar-linux/flatcar-sdk-all:3033.0.0 "/bin/sh -c /home/sd…" 4 hours ago Exited (0) About an hour ago flatcar-sdk-all-3033.0.0_os-3033.0.0 +19ea3b6d00ad ghcr.io/flatcar/flatcar-sdk-all:3033.0.0 "/bin/sh -c /home/sd…" 4 hours ago Exited (0) About an hour ago flatcar-sdk-all-3033.0.0_os-3033.0.0 ``` Re-use of containers happens on a per-name basis. The above example's container name `flatcar-sdk-all-3033.0.0_os-3033.0.0` is generated automatically. Using `docker container rm` the container can be discarded - a subsequent call to `./run_sdk_container` will create a new one. Custom containers can be created by use of the `-n ` command line option; these will be re-used in subsequent calls to `./run_sdk_container` when using the same ``. diff --git a/ci-automation/README.md b/ci-automation/README.md index 7877ebe4e2..df623147be 100644 --- a/ci-automation/README.md +++ b/ci-automation/README.md @@ -43,7 +43,7 @@ image_build amd64 This step updates the versionfile, recording the SDK container version just built. It will generate and push a new version tag to the scripts repo. 2. SDK container build (`sdk_container.sh`) : use SDK tarball to build an SDK container image. - The resulting image will come in "amd64", "arm64", and "all" flavours, with support for respective OS target architectures. This step builds the Flatcar SDK container images published at ghcr.io/flatcar-linux. + The resulting image will come in "amd64", "arm64", and "all" flavours, with support for respective OS target architectures. This step builds the Flatcar SDK container images published at ghcr.io/flatcar. ``` .---------. .------------. .--------. diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env index 11c89d0287..1c2e5b4735 100644 --- a/ci-automation/ci-config.env +++ b/ci-automation/ci-config.env @@ -13,7 +13,7 @@ BUILDCACHE_PATH_PREFIX="/srv/bincache" BUILDCACHE_USER="bincache" RELEASES_SERVER="mirror.release.flatcar-linux.net" -CONTAINER_REGISTRY="ghcr.io/flatcar-linux" +CONTAINER_REGISTRY="ghcr.io/flatcar" GC_BUCKET="flatcar-linux" @@ -21,7 +21,7 @@ DEFAULT_HTTP_IMAGE_URL_TEMPLATE="@PROTO@://${BUILDCACHE_SERVER}/images/@ARCH@/@V if ! command -v pigz > /dev/null; then # No PIGZ on Flatcar - PIGZ="docker run --rm -i ghcr.io/flatcar-linux/pigz --fast" + PIGZ="docker run --rm -i ghcr.io/flatcar/pigz --fast" fi CI_GIT_AUTHOR="flatcar-ci" diff --git a/ci-automation/packages-tag.sh b/ci-automation/packages-tag.sh index f874f8846f..7ae886866f 100644 --- a/ci-automation/packages-tag.sh +++ b/ci-automation/packages-tag.sh @@ -16,7 +16,7 @@ # # 1. SDK version is recorded in sdk_container/.repo/manifests/version.txt # 2. SDK container is either -# - available via ghcr.io/flatcar-linux/flatcar-sdk-[ARCH]:[VERSION] (official SDK release) +# - available via ghcr.io/flatcar/flatcar-sdk-[ARCH]:[VERSION] (official SDK release) # OR # - available via build cache server "/containers/[VERSION]/flatcar-sdk-[ARCH]-[VERSION].tar.gz" # (dev SDK) diff --git a/ci-automation/packages.sh b/ci-automation/packages.sh index dcddb0dcbf..465eb4d58e 100644 --- a/ci-automation/packages.sh +++ b/ci-automation/packages.sh @@ -16,7 +16,7 @@ # 1. SDK version and OS image version are recorded in sdk_container/.repo/manifests/version.txt # 2. Scripts repo version tag of OS image version to be built is available and checked out. # 3. SDK container is either -# - available via ghcr.io/flatcar-linux/flatcar-sdk-[ARCH]:[VERSION] (official SDK release) +# - available via ghcr.io/flatcar/flatcar-sdk-[ARCH]:[VERSION] (official SDK release) # OR # - available via build cache server "/containers/[VERSION]/flatcar-sdk-[ARCH]-[VERSION].tar.gz" # (dev SDK) diff --git a/ci-automation/release.sh b/ci-automation/release.sh index 0ed3b6739c..37003bf129 100644 --- a/ci-automation/release.sh +++ b/ci-automation/release.sh @@ -19,7 +19,7 @@ # 4. Vendor image and torcx docker tarball + manifest to run tests for are available on buildcache # ( images/[ARCH]/[FLATCAR_VERSION]/ ) # 5. SDK container is either -# - available via ghcr.io/flatcar-linux/flatcar-sdk-[ARCH]:[VERSION] (official SDK release) +# - available via ghcr.io/flatcar/flatcar-sdk-[ARCH]:[VERSION] (official SDK release) # OR # - available via build cache server "/containers/[VERSION]/flatcar-sdk-[ARCH]-[VERSION].tar.gz" # (dev SDK) diff --git a/ci-automation/sdk_bootstrap.sh b/ci-automation/sdk_bootstrap.sh index b2e53d0b07..f65536ed24 100644 --- a/ci-automation/sdk_bootstrap.sh +++ b/ci-automation/sdk_bootstrap.sh @@ -17,7 +17,7 @@ # 1. Version of the SEED SDK to use (string). # The seed SDK tarball must be available on https://mirror.release.flatcar-linux.net/sdk/ ... # The seed SDK container must be available from https://github.com/orgs/flatcar-linux/packages -# (via ghcr.io/flatcar-linux/flatcar-sdk-all:[VERSION]). +# (via ghcr.io/flatcar/flatcar-sdk-all:[VERSION]). # # 2. Version of the TARGET SDK to build (string). # The version pattern 'MMMM.m.p' (e.g. '3051.0.0') denotes a "official" build, i.e. a release build to be published. diff --git a/sdk_container/.repo/manifests/mantle-container b/sdk_container/.repo/manifests/mantle-container index e11e02a228..95cbdfa1d8 100644 --- a/sdk_container/.repo/manifests/mantle-container +++ b/sdk_container/.repo/manifests/mantle-container @@ -1 +1 @@ -ghcr.io/flatcar-linux/mantle:git-fb7bbf6e2c863c0bcfb9dcba4c090e45eb8c4742 +ghcr.io/flatcar/mantle:git-fb7bbf6e2c863c0bcfb9dcba4c090e45eb8c4742 diff --git a/sdk_lib/sdk_container_common.sh b/sdk_lib/sdk_container_common.sh index fc88e98d16..e8fd718bff 100644 --- a/sdk_lib/sdk_container_common.sh +++ b/sdk_lib/sdk_container_common.sh @@ -8,7 +8,7 @@ # globals # sdk_container_common_versionfile="sdk_container/.repo/manifests/version.txt" -sdk_container_common_registry="ghcr.io/flatcar-linux" +sdk_container_common_registry="ghcr.io/flatcar" sdk_container_common_env_file="sdk_container/.sdkenv" # Check for podman and docker; use docker if present, podman alternatively.