From e6096a18b705543abbefbf52f3659fed5d331a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 24 Feb 2022 18:26:56 +0100
Subject: [PATCH] gitlab-ci: build docker image as part of the CI

This makes Gitlab CI docker image update part of the CI run and thus in
sync with Dockerfile in repository.
---
 .gitlab-ci.yml | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc646c9b3..87783cbb2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,27 @@
-image: registry.nic.cz/turris/os/build
+image: $CI_REGISTRY_IMAGE
 
 stages:
+  - docker
   - build
   - verify
 
+## Docker stage ##################################################################
+docker:
+  stage: docker
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/docker
+  services:
+    - $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/docker:dind
+  tags:
+    - dind
+    - privileged
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  script:
+    - docker pull $CI_REGISTRY_IMAGE || true
+    - docker build --pull --cache-from $CI_REGISTRY_IMAGE --tag $CI_REGISTRY_IMAGE --file .gitlab-ci/Dockerfile .gitlab-ci
+    - docker push $CI_REGISTRY_IMAGE
+
+
 ## Package build prepare #########################################################
 .prepare:
   stage: build
-- 
GitLab