[gimp/wip/schumaml/tune-prepare-stage: 35/55] build: use variables for CI image images

[Michael Schumacher <schumaml src gnome org>]

commit cf39e156fbfc9505641ed0a9b286a20c3ba1cb73
Author: Michael Schumacher <schumaml gmx de>
Date:   Sat May 30 16:49:25 2020 +0200

    build: use variables for CI image images

 .gitlab-ci.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79a904939e..7aa6bd8230 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,9 @@ variables:
   INSTALL_DIR: "_install"
   INSTALL_PREFIX: "${CI_PROJECT_DIR}/${INSTALL_DIR}"
   APT_CACHE: "${CI_PROJECT_DIR}/apt-cache"
+  BUILD_IMAGE: "$CI_REGISTRY_IMAGE:build-debian-latest"
+  BUILD_IMAGE_WIN64: "$CI_REGISTRY_IMAGE:build-win64-latest-tuning"
+  BUILD_IMAGE_WIN32: "$CI_REGISTRY_IMAGE:build-win32-latest-tuning"
 
 ## prepare docker images ##
 
@@ -30,7 +33,7 @@ build-image:
     - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
     - echo "at-spi2-core build-essential desktop-file-utils ffmpeg ghostscript git glib-networking 
gobject-introspection graphviz-dev gtk-doc-tools hicolor-icon-theme intltool iso-codes libappstream-glib-dev 
libbz2-dev libdbus-glib-1-dev libexif-dev libgexiv2-dev libgirepository1.0-dev libgtk-3-bin libgtk-3-dev 
libgudev-1.0-dev libjson-glib-dev liblcms2-dev liblzma-dev libmng-dev libmypaint-dev libopenexr-dev 
libpoppler-glib-dev libraw-dev libraw19 librsvg2-dev libspiro-dev libsuitesparse-dev libtiff-dev libtiff5-dev 
libtool libumfpack5 libwebp-dev libwmf-dev libxmu-dev libxpm-dev luajit meson mypaint-brushes poppler-data 
python3 valac xauth xvfb" >> Dockerfile
 
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-debian-latest --cache=true --cache-ttl=120h
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$BUILD_IMAGE--cache=true --cache-ttl=120h
 
 
 build-image-win64:
@@ -52,7 +55,7 @@ build-image-win64:
     - echo "RUN git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git" >> 
Dockerfile
     - echo "RUN cd crossroad && ./setup.py install --prefix=`pwd`/../.local" >> Dockerfile
 
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win64-latest --cache=true --cache-ttl=120h
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$BUILD_IMAGE_WIN64 --cache=true --cache-ttl=120h
 
 
 build-image-win32:
@@ -74,14 +77,14 @@ build-image-win32:
     - echo "RUN git clone --depth=${GIT_DEPTH} git://git.tuxfamily.org/gitroot/crossroad/crossroad.git" >> 
Dockerfile
     - echo "RUN cd crossroad && ./setup.py install --prefix=`pwd`/../.local" >> Dockerfile
 
-    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:build-win32-latest --cache=true --cache-ttl=120h
+    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$BUILD_IMAGE_WIN32 --cache=true --cache-ttl=120h
 
 
 ## GNU/Linux 64-bit CIs ##
 
 deps-debian/testing:
   stage: dependencies
-  image: $CI_REGISTRY_IMAGE:build-debian-latest
+  image: $BUILD_IMAGE
   cache:
     paths:
     - apt-cache
@@ -113,7 +116,7 @@ deps-debian/testing:
 
 .gimp-debian/testing-base:
   stage: gimp
-  image: $CI_REGISTRY_IMAGE:build-debian-latest
+  image: $BUILD_IMAGE
   dependencies:
     - deps-debian/testing
   cache:
@@ -182,7 +185,7 @@ gimp-debian/testing-clang:
 
 deps-win64:
   stage: dependencies
-  image: $CI_REGISTRY_IMAGE:build-win64-latest
+  image: $BUILD_IMAGE_WIN64
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
     XDG_DATA_HOME:  "$CI_PROJECT_DIR/.local/share/"
@@ -204,7 +207,7 @@ deps-win64:
 
 gimp-win64:
   stage: gimp
-  image: $CI_REGISTRY_IMAGE:build-win64-latest
+  image: $BUILD_IMAGE_WIN64
   dependencies:
     - deps-win64
   variables:
@@ -238,7 +241,7 @@ gimp-win64:
 
 deps-win32:
   stage: dependencies
-  image: $CI_REGISTRY_IMAGE:build-win32-latest
+  image: $BUILD_IMAGE_WIN32
   variables:
     XDG_CACHE_HOME: "$CI_PROJECT_DIR/.cache/"
     XDG_DATA_HOME:  "$CI_PROJECT_DIR/.local/share/"
@@ -260,7 +263,7 @@ deps-win32:
 
 gimp-win32:
   stage: gimp
-  image: $CI_REGISTRY_IMAGE:build-win32-latest
+  image: $BUILD_IMAGE_WIN32
   dependencies:
     - deps-win32
   variables: