mirrors/kube-arangodb
1
0
Fork 0
mirror of https://github.com/arangodb/kube-arangodb.git synced 2024-12-14 11:57:37 +00:00
Code Activity

Feature/add ubi based image (#486)

Browse source
This commit is contained in:
Adam Janikowski 2019-10-31 07:48:27 +01:00 committed by GitHub
parent 396fd079cc
commit 0bf7b6cc36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Dockerfile
View file

@ -1,4 +1,16 @@
FROM scratch
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/

16
Makefile
View file

@ -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
@ -161,7 +166,7 @@ fmt:
$(ROOTDIR)/pkg/backup/...
.PHONY: build
build: docker manifests
build: docker docker-ubi manifests
.PHONY: clean
clean:
@ -216,11 +221,18 @@ $(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 "VERSION=${VERSION_MAJOR_MINOR_PATCH}" --build-arg "IMAGE=$(BASEUBIIMAGE)" -t $(OPERATORUBIIMAGE) .
ifdef PUSHIMAGES
docker push $(OPERATORUBIIMAGE)
endif
# Manifests
.PHONY: manifests-crd