From 5157363772a3ac0657eedae380af441b25b5e3da Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 30 Apr 2024 18:16:10 +0200 Subject: [PATCH] ci: factor out all the deps to build the debian containers into .debian-container Part-of: --- .gitlab-ci/container/gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index f920ef4eb56..4d8dff8ba5c 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -44,6 +44,12 @@ variables: FDO_DISTRIBUTION_VERSION: bookworm-slim +.debian-container: + extends: + - .fdo.container-build@debian + - .container + - .debian-container-version + .container: stage: container extends: @@ -63,9 +69,7 @@ # Debian based x86_64 build image base debian/x86_64_build-base: extends: - - .fdo.container-build@debian - - .container - - .debian-container-version + - .debian-container variables: MESA_IMAGE_TAG: &debian-x86_64_build-base "${DEBIAN_BASE_TAG}--${PKG_REPO_REV}" rules: