From a6f63c25602577796576ccd9fe075c588626b194 Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Thu, 6 Aug 2020 13:25:28 +0200
Subject: ci: tag branch name

---
 .gitlab-ci.yml | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ff1ab9e..7affaf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,25 @@
-include:
-  - project: 'kraxel/podman-docker-builder'
-    file: 'gitlab-ci-template.yml'
+# https://blog.callr.tech/building-docker-images-with-gitlab-ci-best-practices/
+# comments dropped, updated for podman builds
+# this variant builds without caching
+
+image: registry.gitlab.com/kraxel/podman-docker-builder:latest
+
+stages:
+  - build
+
+before_script:
+  - podman login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+
+Build:
+  stage: build
+  only:
+    - branches
+  script:
+    - >
+      podman build
+      --build-arg VCS_REF=$CI_COMMIT_SHA
+      --build-arg VCS_URL=$CI_PROJECT_URL
+      --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+      .
+    - podman push $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH
+
-- 
cgit