Skip to content
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

added scratch images #974

Merged
merged 1 commit into from
Jun 12, 2024
Merged

added scratch images #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions Docker-multiarch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
ARG base_image
ARG USER_UID=1001
ARG USER_NAME=vm-operator

FROM alpine as passwd

ARG TARGETARCH
ARG USER_UID
ARG USER_NAME

ENV USER_UID=${USER_UID} \
USER_NAME=${USER_NAME}
RUN adduser -S -D -u ${USER_UID} -s /bin/false ${USER_NAME} && \
cat /etc/passwd | grep ${USER_NAME} > /etc/passwd_export

FROM ${base_image}
# src_binary arg must be in scope, after FROM

ARG TARGETARCH
ARG USER_UID
ARG USER_NAME

ENV OPERATOR=/usr/local/bin/manager \
USER_UID=1001 \
USER_NAME=vm-operator
USER_UID=${USER_ID} \
USER_NAME=${USER_NAME}

# install operator
COPY bin/manager-${TARGETARCH} ${OPERATOR}

RUN adduser -S -D -u ${USER_UID} ${USER_NAME}
COPY --from=passwd /etc/passwd_export /etc/passwd

ENTRYPOINT ["/usr/local/bin/manager"]

Expand Down
21 changes: 11 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CRD_PRESERVE=x-kubernetes-preserve-unknown-fields true
# Default bundle image tag
BUNDLE_IMG ?= controller-bundle:$(VERSION)
ALPINE_IMAGE=alpine:3.19.1
SCRATCH_IMAGE=scratch
CHANNEL=beta
DEFAULT_CHANNEL=beta
BUNDLE_CHANNELS := --channels=$(CHANNEL)
Expand Down Expand Up @@ -369,27 +370,27 @@ package-arch:


build-operator-crosscompile: fmt vet
CGO_ENABLED=0 GOARCH=arm $(MAKE) package-arch
CGO_ENABLED=0 GOARCH=arm64 $(MAKE) package-arch
CGO_ENABLED=0 GOARCH=amd64 $(MAKE) package-arch
CGO_ENABLED=0 GOARCH=ppc64le $(MAKE) package-arch
CGO_ENABLED=0 GOARCH=386 $(MAKE) package-arch
CGO_ENABLED=0 GOOS=linux GOARCH=arm $(MAKE) package-arch
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 $(MAKE) package-arch
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 $(MAKE) package-arch
CGO_ENABLED=0 GOOS=linux GOARCH=ppc64le $(MAKE) package-arch
CGO_ENABLED=0 GOOS=linux GOARCH=386 $(MAKE) package-arch

docker-operator-manifest-build-and-push:
export DOCKER_CLI_EXPERIMENTAL=enabled ;\
! ( docker buildx ls | grep operator-builder ) && docker buildx create --use --platform=$(MANIFEST_BUILD_PLATFORM) --name operator-builder ;\
docker buildx build \
--builder operator-builder \
-t $(DOCKER_REPO):$(TAG) \
-t $(DOCKER_REPO):$(COMMIT_SHA) \
-t $(DOCKER_REPO):latest \
$(foreach v,$(TAGS),-t $(DOCKER_REPO):$(v)) \
--platform=$(MANIFEST_BUILD_PLATFORM) \
--build-arg base_image=$(ALPINE_IMAGE) \
--build-arg base_image=$(BASE_IMAGE) \
-f Docker-multiarch \
--push \
.

publish-via-docker: build-operator-crosscompile docker-operator-manifest-build-and-push
publish-via-docker: build-operator-crosscompile
BASE_IMAGE=$(ALPINE_IMAGE) TAGS="$(TAG) $(COMMIT_SHA) latest" $(MAKE) docker-operator-manifest-build-and-push
BASE_IMAGE=$(SCRATCH_IMAGE) TAGS="$(TAG)-scratch $(COMMIT_SHA)-scratch latest-scratch" $(MAKE) docker-operator-manifest-build-and-push


# builds image and loads it into kind.
Expand Down
Loading