From 397dde7814ee1a8ace55eb3e3e84c91268508dea Mon Sep 17 00:00:00 2001
From: Markus <2408212-1O@users.noreply.gitlab.com>
Date: Sun, 18 Nov 2018 12:52:54 +0000
Subject: [PATCH] Dockerhub integration

---
 .gitlab-ci.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9228439..20f0fa2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,11 +2,15 @@ stages:
   - build:docker
 
 variables:
-  IMAGE_NAME: "$CI_REGISTRY_IMAGE/bw_backup"
+  IMAGE_NAME: "$CI_REGISTRY_IMAGE"
+  IMAGE_NAME_DOCKERHUB: "index.docker.io/bruceforce/bw_backup"
 
 .docker_login: &docker_login
   docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
+.dockerhub_login: &dockerhub_login
+  docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_PASSWORD" $DOCKERHUB_REGISTRY
+
 .docker_build_template: &docker_build
   stage: build:docker
   image: docker:latest
@@ -19,17 +23,20 @@ build_master:
   <<: *docker_build
   script:
     - *docker_login
-    - docker build --pull -t "$IMAGE_NAME" .
+    - docker build --pull -t "$IMAGE_NAME" -t "$IMAGE_NAME_DOCKERHUB" .
     - docker push "$IMAGE_NAME"
   only:
-    - master 
+    - master
 
 build_master_rpi3:
   <<: *docker_build
   script:
     - *docker_login
-    - docker build --pull -t "$IMAGE_NAME:rpi3" .
+    - docker build --pull -t "$IMAGE_NAME:rpi3" -t "$IMAGE_NAME_DOCKERHUB:rpi3" .
     - docker push "$IMAGE_NAME:rpi3"
+      # dockerhub can't autobuild for arm - so push this build to dockerhub
+    - *dockerhub_login
+    - docker push "$IMAGE_NAME_DOCKERHUB:rpi3"
   tags:
     - rpi3
   only:
@@ -39,7 +46,8 @@ build:
   <<: *docker_build
   script:
     - *docker_login
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+    - docker build --pull -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup" .
+    - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup"
   except:
     - master
+