Skip to content

Commit 0bf7b6c

Browse files
authored
Feature/add ubi based image (#486)
1 parent 396fd07 commit 0bf7b6c

File tree

2 files changed

+27
-3
lines changed

2 files changed

+27
-3
lines changed

Dockerfile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
FROM scratch
1+
ARG IMAGE=scratch
2+
FROM ${IMAGE}
3+
4+
ARG VERSION
5+
LABEL name="kube-arangodb" \
6+
vendor="ArangoDB" \
7+
version="${VERSION}" \
8+
release="${VERSION}" \
9+
summary="ArangoDB Kubernetes Oparator" \
10+
description="ArangoDB Kubernetes Operator" \
11+
maintainer="[email protected]"
12+
13+
ADD ./LICENSE /licenses/LICENSE
214

315
ADD bin/arangodb_operator /usr/bin/
416

Makefile

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,14 @@ ifndef DEPLOYMENTNAMESPACE
7878
DEPLOYMENTNAMESPACE := default
7979
endif
8080

81+
BASEUBIIMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:8.0
82+
8183
ifndef OPERATORIMAGE
8284
OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
8385
endif
86+
ifndef OPERATORUBIIMAGE
87+
OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
88+
endif
8489
ifndef TESTIMAGE
8590
TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
8691
endif
@@ -161,7 +166,7 @@ fmt:
161166
$(ROOTDIR)/pkg/backup/...
162167

163168
.PHONY: build
164-
build: docker manifests
169+
build: docker docker-ubi manifests
165170

166171
.PHONY: clean
167172
clean:
@@ -216,11 +221,18 @@ $(BIN): $(SOURCES) dashboard/assets.go VERSION
216221

217222
.PHONY: docker
218223
docker: check-vars $(BIN)
219-
docker build -f $(DOCKERFILE) -t $(OPERATORIMAGE) .
224+
docker build -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" -t $(OPERATORIMAGE) .
220225
ifdef PUSHIMAGES
221226
docker push $(OPERATORIMAGE)
222227
endif
223228

229+
.PHONY: docker-ubi
230+
docker-ubi: check-vars $(BIN)
231+
docker build -f $(DOCKERFILE) --build-arg "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE) .
232+
ifdef PUSHIMAGES
233+
docker push $(OPERATORUBIIMAGE)
234+
endif
235+
224236
# Manifests
225237

226238
.PHONY: manifests-crd

0 commit comments

Comments
 (0)