File tree Expand file tree Collapse file tree 2 files changed +27
-3
lines changed Expand file tree Collapse file tree 2 files changed +27
-3
lines changed Original file line number Diff line number Diff line change 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+ 12+
13+ ADD ./LICENSE /licenses/LICENSE
214
315ADD bin/arangodb_operator /usr/bin/
416
Original file line number Diff line number Diff line change @@ -78,9 +78,14 @@ ifndef DEPLOYMENTNAMESPACE
7878 DEPLOYMENTNAMESPACE := default
7979endif
8080
81+ BASEUBIIMAGE ?= registry.access.redhat.com/ubi8/ubi-minimal:8.0
82+
8183ifndef OPERATORIMAGE
8284 OPERATORIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)
8385endif
86+ ifndef OPERATORUBIIMAGE
87+ OPERATORUBIIMAGE := $(DOCKERNAMESPACE)/kube-arangodb$(IMAGESUFFIX)-ubi
88+ endif
8489ifndef TESTIMAGE
8590 TESTIMAGE := $(DOCKERNAMESPACE)/kube-arangodb-test$(IMAGESUFFIX)
8691endif
161166 $(ROOTDIR ) /pkg/backup/...
162167
163168.PHONY : build
164- build : docker manifests
169+ build : docker docker-ubi manifests
165170
166171.PHONY : clean
167172clean :
@@ -216,11 +221,18 @@ $(BIN): $(SOURCES) dashboard/assets.go VERSION
216221
217222.PHONY : docker
218223docker : check-vars $(BIN )
219- docker build -f $(DOCKERFILE ) -t $(OPERATORIMAGE ) .
224+ docker build -f $(DOCKERFILE ) --build-arg " VERSION= ${VERSION_MAJOR_MINOR_PATCH} " - t $(OPERATORIMAGE ) .
220225ifdef PUSHIMAGES
221226 docker push $(OPERATORIMAGE)
222227endif
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
You can’t perform that action at this time.
0 commit comments