[Feature] Envoy Image Layer

Author: ajanikow

Dockerfile

@@ -1,5 +1,15 @@
-ARG IMAGE=scratch
-FROM ${IMAGE}
+ARG IMAGE=alpine:3.17
+ARG ENVOY_IMAGE=envoyproxy/envoy:v1.31.0
+
+# Build Steps
+
+FROM ${ENVOY_IMAGE} AS envoy
+
+FROM ${IMAGE} AS base
+
+RUN apk upgrade --no-cache
+
+FROM base
 
 ARG VERSION
 LABEL name="kube-arangodb" \
@@ -15,5 +25,6 @@ ADD ./LICENSE /licenses/LICENSE
 ARG RELEASE_MODE=community
 ARG TARGETARCH
 ADD bin/${RELEASE_MODE}/linux/${TARGETARCH}/arangodb_operator /usr/bin/arangodb_operator
+COPY --from=envoy /usr/local/bin/envoy /usr/local/bin/envoy
 
 ENTRYPOINT [ "/usr/bin/arangodb_operator" ]

Dockerfile.ubi

@@ -1,4 +1,30 @@
 ARG IMAGE=registry.access.redhat.com/ubi8/ubi-minimal:8.4
-FROM ${IMAGE}
+ARG ENVOY_IMAGE=envoyproxy/envoy:v1.31.0
 
-RUN microdnf update && microdnf clean all
+# Build Steps
+
+FROM ${ENVOY_IMAGE} AS envoy
+
+FROM ${IMAGE} AS base
+
+RUN microdnf update && microdnf clean all
+
+FROM base
+
+ARG VERSION
+LABEL name="kube-arangodb" \
+      vendor="ArangoDB" \
+      version="${VERSION}" \
+      release="${VERSION}" \
+      summary="ArangoDB Kubernetes Oparator" \
+      description="ArangoDB Kubernetes Operator" \
+      maintainer="[email protected]"
+
+ADD ./LICENSE /licenses/LICENSE
+
+ARG RELEASE_MODE=community
+ARG TARGETARCH
+ADD bin/${RELEASE_MODE}/linux/${TARGETARCH}/arangodb_operator /usr/bin/arangodb_operator
+COPY --from=envoy /usr/local/bin/envoy /usr/local/bin/envoy
+
+ENTRYPOINT [ "/usr/bin/arangodb_operator" ]

Makefile

@@ -488,10 +488,16 @@ endif
 
 .PHONY: docker-ubi
 docker-ubi: check-vars $(VBIN_LINUX_AMD64)
-	docker build --no-cache -f "$(DOCKERFILE).ubi" --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE)-local-only-build .
-	docker build --no-cache -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "TARGETARCH=amd64" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" --build-arg "IMAGE=$(OPERATORUBIIMAGE)-local-only-build" -t $(OPERATORUBIIMAGE) .
 ifdef PUSHIMAGES
-	docker push $(OPERATORUBIIMAGE)
+	docker buildx build --no-cache -f "$(DOCKERFILE).ubi" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
+		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \
+		--build-arg "IMAGE=$(BASEUBIIMAGE)" \
+		--platform linux/amd64 --push -t $(OPERATORUBIIMAGE) .
+else
+	docker buildx build --no-cache -f "$(DOCKERFILE).ubi" --build-arg GOVERSION=$(GOVERSION) --build-arg DISTRIBUTION=$(DISTRIBUTION) \
+		--build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "RELEASE_MODE=$(RELEASE_MODE)" \
+		--build-arg "IMAGE=$(BASEUBIIMAGE)" \
+		--platform linux/amd64 -t $(OPERATORUBIIMAGE) .
 endif
 
 # Manifests