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

Update build related files #69

Merged
merged 1 commit into from
Jan 18, 2022
Merged

Update build related files #69

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
4 changes: 2 additions & 2 deletions Makefile.prow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ XARGS = xargs -0 ${XARGS_FLAGS}
CLEANXARGS = xargs ${XARGS_FLAGS}

IMG ?= $(shell cat COMPONENT_NAME 2> /dev/null)
REGISTRY = quay.io/open-cluster-management
REGISTRY = quay.io/stolostron
VERSION ?= $(shell cat COMPONENT_VERSION 2> /dev/null)
IMAGE_NAME_AND_VERSION ?= $(REGISTRY)/$(IMG):$(VERSION)
export GOPACKAGES = $(shell go list ./... | grep -v /manager | grep -v /bindata | grep -v /vendor | grep -v /internal | grep -v /build | grep -v /test | grep -v /e2e )
Expand All @@ -56,7 +56,7 @@ build:
.PHONY: build-images

build-images: build
@docker build -t ${IMAGE_NAME_AND_VERSION} -f build/Dockerfile .
@docker build -t ${IMAGE_NAME_AND_VERSION} -f build/Dockerfile.prow .
@docker tag ${IMAGE_NAME_AND_VERSION} $(REGISTRY)/$(IMG):latest

.PHONY: lint
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/open-cluster-management/builder:go1.17-linux AS plugin-builder
FROM registry.ci.openshift.org/stolostron/builder:go1.17-linux AS plugin-builder
ENV POLICY_GENERATOR_TAG=v1.2.3

WORKDIR /policy-generator
Expand Down
12 changes: 6 additions & 6 deletions build/Dockerfile.prow
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.ci.openshift.org/open-cluster-management/builder:go1.17-linux AS builder
FROM registry.ci.openshift.org/stolostron/builder:go1.17-linux AS builder
ENV POLICY_GENERATOR_TAG=v1.2.3

WORKDIR /go/src/github.com/open-cluster-management/multicluster-operators-subscription
WORKDIR /go/src/github.com/stolostron/multicluster-operators-subscription
COPY . .
RUN make -f Makefile.prow build

Expand Down Expand Up @@ -29,10 +29,10 @@ ENV OPERATOR=/usr/local/bin/multicluster-operators-subscription \
KUSTOMIZE_PLUGIN_HOME=/etc/kustomize/plugin

# install operator binary
COPY --from=builder /go/src/github.com/open-cluster-management/multicluster-operators-subscription/build/_output/bin/multicluster-operators-subscription ${OPERATOR}
COPY --from=builder /go/src/github.com/open-cluster-management/multicluster-operators-subscription/build/_output/bin/multicluster-operators-placementrule /usr/local/bin
COPY --from=builder /go/src/github.com/open-cluster-management/multicluster-operators-subscription/build/_output/bin/uninstall-crd /usr/local/bin
COPY --from=builder /go/src/github.com/open-cluster-management/multicluster-operators-subscription/build/_output/bin/appsubsummary /usr/local/bin
COPY --from=builder /go/src/github.com/stolostron/multicluster-operators-subscription/build/_output/bin/multicluster-operators-subscription ${OPERATOR}
COPY --from=builder /go/src/github.com/stolostron/multicluster-operators-subscription/build/_output/bin/multicluster-operators-placementrule /usr/local/bin
COPY --from=builder /go/src/github.com/stolostron/multicluster-operators-subscription/build/_output/bin/uninstall-crd /usr/local/bin
COPY --from=builder /go/src/github.com/stolostron/multicluster-operators-subscription/build/_output/bin/appsubsummary /usr/local/bin

# install the policy generator Kustomize plugin
RUN mkdir -p $KUSTOMIZE_PLUGIN_HOME/policy.open-cluster-management.io/v1/policygenerator
Expand Down