From cd4f6cdcf44c4f789aaf5b5e2b19bb64edc7f259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Tue, 8 Dec 2020 17:22:28 +0100 Subject: [PATCH] =?UTF-8?q?docs:=20Adapt=20to=20FDO=5FDISTRIBUTION=5FTAG?= =?UTF-8?q?=20=E2=86=92=20MESA=5FIMAGE=5FTAG=20rename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: 0781d9825b31 "ci: Append $MESA_TEMPLATES_COMMIT to image tags" Reviewed-by: Andres Gomez Part-of: --- docs/ci/index.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ci/index.rst b/docs/ci/index.rst index c9350c6b24d..33ed30dceda 100644 --- a/docs/ci/index.rst +++ b/docs/ci/index.rst @@ -160,10 +160,10 @@ apt cache, and other such common pitfalls of building Docker images). When running a container job, the templates will look for an existing build of that image in the container registry under -``FDO_DISTRIBUTION_TAG``. If it's found it will be reused, and if +``MESA_IMAGE_TAG``. If it's found it will be reused, and if not, the associated `.gitlab-ci/containers/.sh`` will be run to build it. So, when developing any change to container build -scripts, you need to update the associated ``FDO_DISTRIBUTION_TAG`` to +scripts, you need to update the associated ``MESA_IMAGE_TAG`` to a new unique string. We recommend using the current date plus some string related to your branch (so that if you rebase on someone else's container update from the same day, you will get a Git conflict