From f4897b0e19e57003f813ddcc06bc7035c793c029 Mon Sep 17 00:00:00 2001
From: ajanikow <adam.janikowski@ce-solutions.pl>
Date: Fri, 18 Oct 2019 20:39:07 +0000
Subject: [PATCH 1/4] feature/add_ubi_based_image

---
 Dockerfile |  3 ++-
 Makefile   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index b3b05bbc5..889cca860 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM scratch 
+ARG IMAGE=scratch
+FROM ${IMAGE}
 
 ADD bin/arangodb_operator /usr/bin/
 
diff --git a/Makefile b/Makefile
index ff9e8ad74..9eb1a4a79 100644
--- a/Makefile
+++ b/Makefile
@@ -78,9 +78,14 @@ ifndef DEPLOYMENTNAMESPACE
 	DEPLOYMENTNAMESPACE := default
 endif
 
+BASEUBIIMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:8.0
+
 ifndef OPERATORIMAGE
 	OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
 endif
+ifndef OPERATORUBIIMAGE
+	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
+endif
 ifndef TESTIMAGE
 	TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
 endif
@@ -221,6 +226,13 @@ ifdef PUSHIMAGES
 	docker push $(OPERATORIMAGE)
 endif
 
+.PHONY: docker-ubi
+docker-ubi: check-vars $(BIN)
+	docker build -f $(DOCKERFILE) --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE) .
+ifdef PUSHIMAGES
+	docker push $(OPERATORUBIIMAGE)
+endif
+
 # Manifests
 
 .PHONY: manifests-crd

From ff7bad1f14c3264096e76da1c708ec7be0af549c Mon Sep 17 00:00:00 2001
From: ajanikow <adam.janikowski@ce-solutions.pl>
Date: Mon, 21 Oct 2019 07:37:43 +0000
Subject: [PATCH 2/4] Adjust image tag

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 9eb1a4a79..99875613e 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ ifndef OPERATORIMAGE
 	OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
 endif
 ifndef OPERATORUBIIMAGE
-	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
+	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi8
 endif
 ifndef TESTIMAGE
 	TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)

From 02d3a24f9df28510abae9b42080a3aba7c25928a Mon Sep 17 00:00:00 2001
From: ajanikow <adam.janikowski@ce-solutions.pl>
Date: Mon, 21 Oct 2019 12:20:27 +0000
Subject: [PATCH 3/4] Makefile dependency

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 99875613e..fce0c8fe1 100644
--- a/Makefile
+++ b/Makefile
@@ -166,7 +166,7 @@ fmt:
 	                  $(ROOTDIR)/pkg/backup/...
 
 .PHONY: build
-build: docker manifests
+build: docker docker-ubi manifests
 
 .PHONY: clean
 clean:

From 62ca0edd044dd12f2b76653e68dd7d295a896f70 Mon Sep 17 00:00:00 2001
From: ajanikow <adam.janikowski@ce-solutions.pl>
Date: Wed, 30 Oct 2019 06:22:51 +0000
Subject: [PATCH 4/4] Update

---
 Dockerfile | 11 +++++++++++
 Makefile   |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 889cca860..ed5102923 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,17 @@
 ARG IMAGE=scratch
 FROM ${IMAGE}
 
+ARG VERSION
+LABEL name="kube-arangodb" \
+      vendor="ArangoDB" \
+      version="${VERSION}" \
+      release="${VERSION}" \
+      summary="ArangoDB Kubernetes Oparator" \
+      description="ArangoDB Kubernetes Operator" \
+      maintainer="redhat@arangodb.com"
+
+ADD ./LICENSE /licenses/LICENSE
+
 ADD bin/arangodb_operator /usr/bin/
 
 ENTRYPOINT [ "/usr/bin/arangodb_operator" ]
\ No newline at end of file
diff --git a/Makefile b/Makefile
index fce0c8fe1..2cde63e8d 100644
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ ifndef OPERATORIMAGE
 	OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
 endif
 ifndef OPERATORUBIIMAGE
-	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi8
+	OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
 endif
 ifndef TESTIMAGE
 	TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
@@ -221,14 +221,14 @@ $(BIN): $(SOURCES) dashboard/assets.go VERSION
 
 .PHONY: docker
 docker: check-vars $(BIN)
-	docker build -f $(DOCKERFILE) -t $(OPERATORIMAGE) .
+	docker build -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" -t $(OPERATORIMAGE) .
 ifdef PUSHIMAGES
 	docker push $(OPERATORIMAGE)
 endif
 
 .PHONY: docker-ubi
 docker-ubi: check-vars $(BIN)
-	docker build -f $(DOCKERFILE) --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE) .
+	docker build -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE) .
 ifdef PUSHIMAGES
 	docker push $(OPERATORUBIIMAGE)
 endif