From 904d7eb3c31906c097e71dbb6ebfaffdbb8f6df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=20Gl=C3=A4=C3=9F-St=C3=B6cker?= <micha@stoecker.me>
Date: Wed, 16 Jun 2021 13:19:44 +0200
Subject: [PATCH] streamlined ci config and push to the docker registry

---
 .gitlab-ci.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 237a600..131932d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,21 @@
-image: jdrouet/docker-with-buildx:stable
+image: docker:dind
 
 variables:
   DOCKER_HOST: tcp://docker:2375/
   DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
 
-services:
-  - docker:dind
-
 build:
   stage: build
+  variables:
+    IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    D_IMAGE_TAG: egon0/docker-with-buildx-and-git:$CI_COMMIT_REF_SLUG
+    D_LATEST_TAG: egon0/docker-with-buildx-and-git:latest
   script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - docker buildx create --use
-    - docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --push -t $CI_REGISTRY_IMAGE .
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
+    - docker build -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $D_IMAGE_TAG -t $D_LATEST_TAG .
+    - docker push $IMAGE_TAG
+    - docker push $CI_REGISTRY_IMAGE:latest
+    - docker push $D_IMAGE_TAG
+    - docker push $D_LATEST_TAG