From 5b3648f502cd0dfc72086e505703180b0d1de6d7 Mon Sep 17 00:00:00 2001
From: David Mehren <git@herrmehren.de>
Date: Sun, 30 May 2021 10:43:53 +0200
Subject: [PATCH] Switch Docker build CI config to our default

---
 .gitlab-ci.yml | 40 ++++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b32fb2..90c5d5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,29 @@
-variables:
-  STORAGE_DRIVER: "vfs"
-  BUILDAH_FORMAT: "docker"
+# Official docker image.
+image: docker:latest
 
-default:
-  image: "quay.io/buildah/stable"
-  before_script:
-    - buildah login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-    - source environment
-    - buildah pull $BASE
-    - >
-        buildah bud
-        --pull
-        --build-arg "BASE=$BASE"
-        --build-arg "LDAP_PLUGIN_URL=$LDAP_PLUGIN_URL"
-        --build-arg login_text="${LOGIN_TEXT}"
-        --build-arg collab_text="${COLLAB_TEXT}"
-        --build-arg admin_is_sysadmin="${ADMIN_IS_SYSADMIN}"
-        -t "$CI_REGISTRY_IMAGE" .
+variables:
+  DOCKER_DRIVER: overlay2
+
+# Docker in Docker Service
+services:
+  - docker:dind
+
+before_script:
+  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  - source environment
 
 build-main:
   script:
-    - buildah tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
-    - buildah push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" "docker://$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
+    - docker build --no-cache --pull -t "$CI_REGISTRY_IMAGE" .
+    - docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
+    - docker push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
+    - docker push "$CI_REGISTRY_IMAGE"
   only:
     - main
 
 build:
   script:
-    - buildah tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
-    - buildah push "$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG" "docker://$CI_REGISTRY_IMAGE:branch-$CI_COMMIT_REF_SLUG"
+    - docker build --no-cache --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
+    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - main