Mesa (staging/21.0): docs: docker: minor stale documentation fix

[GitLab Mirror]

Module: Mesa
Branch: staging/21.0
Commit: cd82f43935c3a6f9f9af421c61c4ba34fcac3ee6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd82f43935c3a6f9f9af421c61c4ba34fcac3ee6

Author: Adrian Ratiu <adrian.ratiu at collabora.com>
Date:   Tue Mar 23 21:41:30 2021 +0200

docs: docker: minor stale documentation fix

Commits like the following changed the script names and distro tag
but didn't update the documentation. We do not explicitely mention
script names because they will likely change in the future but the
distro tag is less likely to change because it is shared with the
upstream ci-templates repo.

Fixes: af7dca35602 ("ci: Update the ci-templates commit.")
Fixes: 506e9d5fc71 ("gitlab-ci: Rename container install scripts to ...")
Fixes: c6c76527535 ("gitlab-ci: Organize images using new REPO_SUFFIX ...")
Signed-off-by: Adrian Ratiu <adrian.ratiu at collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9781>
(cherry picked from commit 8371b75241ee256d85beb6a1fcf43d7ab5bb3e22)

---

 .pick_status.json  | 2 +-
 docs/ci/docker.rst | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 6730460445d..fd025499c08 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -778,7 +778,7 @@
         "description": "docs: docker: minor stale documentation fix",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "af7dca35602be1eda7481176cec596181c8fec41"
     },
diff --git a/docs/ci/docker.rst b/docs/ci/docker.rst
index bca1da4c0ff..97c20d55759 100644
--- a/docs/ci/docker.rst
+++ b/docs/ci/docker.rst
@@ -8,10 +8,9 @@ VK-GL-CTS, on the shared GitLab runners provided by `freedesktop
 Software architecture
 ---------------------
 
-The Docker containers are rebuilt from the debian-install.sh script
-when DEBIAN\_TAG is changed in .gitlab-ci.yml, and
-debian-test-install.sh when DEBIAN\_ARM64\_TAG is changed in
-.gitlab-ci.yml.  The resulting images are around 500MB, and are
+The Docker containers are rebuilt using the shell scripts under
+.gitlab-ci/container/ when the FDO\_DISTRIBUTION\_TAG changes in
+.gitlab-ci.yml. The resulting images are around 1 GB, and are
 expected to change approximately weekly (though an individual
 developer working on them may produce many more images while trying to
 come up with a working MR!).