From 777c0721e08a68ee0b7ef37ca3cbfd9f1699258b Mon Sep 17 00:00:00 2001
From: Gerrit <tirreg91@googlemail.com>
Date: Thu, 26 Nov 2020 11:51:19 +0100
Subject: [PATCH] Still publish deployment-base on Docker Hub.

As this is a pretty important image that we also need to deploy r.metal-stack.io, we still publish this on Docker Hub.
---
 .github/workflows/master-deployment.yaml  | 7 +++++++
 .github/workflows/pull_request.yaml       | 8 ++++++++
 .github/workflows/release-deployment.yaml | 7 +++++++
 metal-deployment/base/Makefile            | 6 ++++++
 4 files changed, 28 insertions(+)

diff --git a/.github/workflows/master-deployment.yaml b/.github/workflows/master-deployment.yaml
index 139ba83..25a9fc7 100644
--- a/.github/workflows/master-deployment.yaml
+++ b/.github/workflows/master-deployment.yaml
@@ -20,6 +20,13 @@ jobs:
         username: ${{ secrets.DOCKER_REGISTRY_USER }}
         password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
 
+    - name: Docker Login
+      uses: docker/login-action@v1
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
     - uses: olegtarasov/get-tag@v1
       id: tagName
 
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
index d53f34e..5369d2e 100644
--- a/.github/workflows/pull_request.yaml
+++ b/.github/workflows/pull_request.yaml
@@ -23,6 +23,14 @@ jobs:
         password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
       if: steps.fork.outputs.is_fork_pr == 'false'
 
+    - name: Docker Login
+      uses: docker/login-action@v1
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+      if: steps.fork.outputs.is_fork_pr == 'false'
+
     - name: Build the Docker images
       run: |
         export GITHUB_TAG_NAME=pr-${GITHUB_HEAD_REF##*/}
diff --git a/.github/workflows/release-deployment.yaml b/.github/workflows/release-deployment.yaml
index 4fec551..510868f 100644
--- a/.github/workflows/release-deployment.yaml
+++ b/.github/workflows/release-deployment.yaml
@@ -18,6 +18,13 @@ jobs:
         username: ${{ secrets.DOCKER_REGISTRY_USER }}
         password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
 
+    - name: Docker Login
+      uses: docker/login-action@v1
+      with:
+        registry: docker.io
+        username: ${{ secrets.DOCKER_HUB_USER }}
+        password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
     - name: Build the Docker images
       run: |
         export GITHUB_TAG_NAME=${GITHUB_REF##*/}
diff --git a/metal-deployment/base/Makefile b/metal-deployment/base/Makefile
index e48290c..72ee8ec 100644
--- a/metal-deployment/base/Makefile
+++ b/metal-deployment/base/Makefile
@@ -7,5 +7,11 @@ dockerimage:
 
 .PHONY: dockerpush
 dockerpush:
+	docker tag ghcr.io/metal-stack/metal-deployment-base:${DOCKER_TAG} metalstack/metal-deployment-base:${DOCKER_TAG}
+	docker tag ghcr.io/metal-stack/metal-deployment-base:${DOCKER_TAG}-vagrant metalstack/metal-deployment-base:${DOCKER_TAG}-vagrant
+
 	docker push ghcr.io/metal-stack/metal-deployment-base:${DOCKER_TAG}
 	docker push ghcr.io/metal-stack/metal-deployment-base:${DOCKER_TAG}-vagrant
+
+	docker push metalstack/metal-deployment-base:${DOCKER_TAG}
+	docker push metalstack/metal-deployment-base:${DOCKER_TAG}-vagrant