fix: Unblock the build process for release branch (#509)

* fix: 1.8 build issues Signed-off-by: iam-veeramalla <[email protected]> * fix: change the ENTRYPOINT Signed-off-by: iam-veeramalla <[email protected]> --------- Signed-off-by: iam-veeramalla <[email protected]>
redhat-developer · May 15, 2023 · 2a90a1e · 2a90a1e
1 parent 5baa670
commit 2a90a1e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,11 +23,11 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
 WORKDIR /
-COPY --from=builder /workspace/manager .
+COPY --from=builder /workspace/manager /usr/local/bin/manager
 
 # install redis artifacts
 COPY build/redis /var/lib/redis
 
 USER 65532:65532
 
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["/usr/local/bin/manager"]
diff --git a/bundle/bundle.Dockerfile b/bundle/bundle.Dockerfile
@@ -3,7 +3,7 @@ FROM scratch
 LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
-LABEL operators.operatorframework.io.bundle.package.v1=openshift-gitops-operator
+LABEL operators.operatorframework.io.bundle.package.v1=gitops-operator
 LABEL operators.operatorframework.io.bundle.channels.v1=latest
 LABEL operators.operatorframework.io.bundle.channel.default.v1=latest
 

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -32,7 +32,7 @@ spec:
           value: openshift-gitops
         - name: OPERATOR_NAME
           value: gitops-operator
-        image: quay.io/redhat-developer/gitops-operator:v1.8.0
+        image: controller
         livenessProbe:
           httpGet:
             path: /healthz