From b32fd280feb56a133c2a5a83f6e98b1d1c6f7bbc Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Tue, 5 Sep 2023 08:54:27 +0300 Subject: [PATCH] doc: Reuse $TAG for git checkout when building Docker images Signed-off-by: Donatas Abraitis --- doc/developer/frr-release-procedure.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/developer/frr-release-procedure.rst b/doc/developer/frr-release-procedure.rst index 6088b52da4..9378637ded 100644 --- a/doc/developer/frr-release-procedure.rst +++ b/doc/developer/frr-release-procedure.rst @@ -152,11 +152,11 @@ Stage 2 - Staging 3. Suppose we are releasing 8.5.0, then ``X.Y.Z`` is ``8.5.0``. Run this: .. code-block:: console - + cd /home/builduser/frr TAG=X.Y.Z git fetch --all - git checkout frr- + git checkout frr-$TAG docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/arm/v7,linux/arm/v6 -f docker/alpine/Dockerfile -t quay.io/frrouting/frr:$TAG --push . git tag docker/$TAG git push origin docker/$TAG @@ -165,7 +165,7 @@ Stage 2 - Staging create a git tag corresponding to the commit that the image was built from and upload that to Github. It's important that the git tag point to the exact codebase that was used to build the docker image, so if any - changes need to be made on top of the ``frr-`` release tag, make + changes need to be made on top of the ``frr-$TAG`` release tag, make sure these changes are committed and pointed at by the ``docker/X.Y.Z`` tag.