Skip to content

Feature/add ubi based image #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 31, 2019
Merged

Feature/add ubi based image #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4897b0
feature/add_ubi_based_image
ajanikow Oct 18, 2019
ff7bad1
Adjust image tag
ajanikow Oct 21, 2019
02d3a24
Makefile dependency
ajanikow Oct 21, 2019
62ca0ed
Update
ajanikow Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
16 changes: 14 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -161,7 +166,7 @@ fmt:
$(ROOTDIR)/pkg/backup/...

.PHONY: build
build: docker manifests
build: docker docker-ubi manifests

.PHONY: clean
clean:
Expand Down Expand Up @@ -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
Expand Down