From 2019e1e96ea62748dd9bc463d7bd119c5e920250 Mon Sep 17 00:00:00 2001
From: Adrien le Maire <adrien@alemaire.be>
Date: Fri, 11 Dec 2020 15:27:46 +0000
Subject: [PATCH] Update .gitlab-ci.yml, minio/Makefile, keycloak/Makefile,
 unifi/Makefile, watchdog/Makefile, minio/Dockerfile, unifi/Dockerfile,
 watchdog/Dockerfile, keycloak/Dockerfile files

---
 .gitlab-ci.yml      | 1 +
 keycloak/Dockerfile | 2 +-
 keycloak/Makefile   | 6 ++++--
 minio/Dockerfile    | 2 +-
 minio/Makefile      | 9 +++++----
 unifi/Dockerfile    | 2 +-
 unifi/Makefile      | 6 ++++--
 watchdog/Dockerfile | 2 +-
 watchdog/Makefile   | 9 +++++----
 9 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57d1cca..5ee1651 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,6 +107,7 @@ keycloak:
   if [ "${CI_COMMIT_REF_PROTECTED}" == "true" ]; then 
     echo "Log on Docker Hub"
     echo "${DOCKER_HUB_KEY}" | docker login -u "alemairebe" --password-stdin
+    docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   fi
 
   mkdir -p /root/.docker/cli-plugins
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index f01d320..5aad6a2 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-20200908-slim
+FROM debian:buster-20201209-slim
 ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/cacert.pem
 ENV CURL_CA_BUNDLE=/etc/ssl/certs/cacert.pem
 
diff --git a/keycloak/Makefile b/keycloak/Makefile
index b1f6726..3e85b8b 100644
--- a/keycloak/Makefile
+++ b/keycloak/Makefile
@@ -6,12 +6,14 @@ IMAGE=keycloak
 nopush:
 	docker buildx build --platform linux/amd64 --load \
 	    --build-arg VERSION=$(VERSION) \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
 push:
 	docker buildx build --platform linux/amd64,linux/arm64,linux/arm --push \
 	    --build-arg VERSION=$(VERSION) \
   	    --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
 	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
diff --git a/minio/Dockerfile b/minio/Dockerfile
index 2e21e5f..63abbc5 100644
--- a/minio/Dockerfile
+++ b/minio/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.12
+FROM alpine:3.12.2
 
 ENV MINIO_ACCESS_KEY_FILE=access_key \
     MINIO_SECRET_KEY_FILE=secret_key \
diff --git a/minio/Makefile b/minio/Makefile
index 786fdf8..a4ddf25 100644
--- a/minio/Makefile
+++ b/minio/Makefile
@@ -6,13 +6,14 @@ IMAGE=minio
 nopush:
 	docker buildx build --platform linux/amd64 --load \
 	    --build-arg VERSION=$(VERSION) \
-    	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
-
+    	--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
 push:
 	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
 	    --build-arg VERSION=$(VERSION) \
-    	    --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
+    	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
 	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
diff --git a/unifi/Dockerfile b/unifi/Dockerfile
index 10dd5f7..c4594fc 100644
--- a/unifi/Dockerfile
+++ b/unifi/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:focal-20200916
+FROM ubuntu:focal-20201106
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/unifi/Makefile b/unifi/Makefile
index 5454e3d..0eab3e0 100644
--- a/unifi/Makefile
+++ b/unifi/Makefile
@@ -7,7 +7,8 @@ nopush:
 	docker buildx build --platform linux/amd64 --load \
 	    --build-arg VERSION=$(VERSION) \
 	    --build-arg UNIFI_VERSION=$(UNIFI_VERSION) \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
 push:
 	docker buildx build --platform linux/amd64,linux/arm64 --push \
@@ -15,4 +16,5 @@ push:
 	    --build-arg UNIFI_VERSION=$(UNIFI_VERSION) \
 	    --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
 	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
diff --git a/watchdog/Dockerfile b/watchdog/Dockerfile
index 87ae439..16e55ba 100644
--- a/watchdog/Dockerfile
+++ b/watchdog/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:buster-20200908-slim
+FROM debian:buster-20201209-slim
 ARG DEBIAN_FRONTEND=noninteractive
 ARG VERSION
 RUN apt update -qq && \
diff --git a/watchdog/Makefile b/watchdog/Makefile
index 93effff..831538d 100644
--- a/watchdog/Makefile
+++ b/watchdog/Makefile
@@ -6,13 +6,14 @@ IMAGE=watchdog
 nopush:
 	docker buildx build --platform linux/amd64 --load \
 	    --build-arg VERSION=$(VERSION) \
-    	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
-
+    	--tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .
 
 push:
 	docker buildx build --platform linux/amd64,linux/arm64,linux/arm,linux/ppc64le --push \
 	    --build-arg VERSION=$(VERSION) \
-    	    --cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
+    	--cache-from=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
 	    --cache-to=type=registry,ref=${NAMESPACE}/buildx:${IMAGE} \
-	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) .
+	    --tag ${NAMESPACE}/${IMAGE}:$(VERSION) \
+		--tag ${CI_REGISTRY_IMAGE}/${IMAGE}:$(VERSION) .