Skip to content

Commit

Permalink
Merge pull request #348 from jzding/update-dockerfile-4.18
Browse files Browse the repository at this point in the history
update sdk-go rest-api version and dev dockerfile
  • Loading branch information
openshift-merge-bot[bot] authored Sep 5, 2024
2 parents 6e5d47e + 3e3ffb3 commit a0bc5d1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ LABEL io.k8s.display-name="Cloud Event Proxy" \
io.openshift.tags="openshift" \
maintainer="Aneesh Puttur <[email protected]>"

ENTRYPOINT ["./cloud-event-proxy"]
ENTRYPOINT ["./cloud-event-proxy"]
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Used by quay.io to trigger developer builds
FROM quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.22-openshift-4.17 AS builder
FROM quay.io/redhat-cne/openshift-origin-release:rhel-9-golang-1.22-openshift-4.18 AS builder

ENV GO111MODULE=off
ENV CGO_ENABLED=1
Expand All @@ -12,7 +12,7 @@ COPY . .

RUN hack/build-go.sh

FROM --platform=linux/x86_64 quay.io/redhat-cne/openshift-origin-release:base-rhel9-4.17 AS bin
FROM --platform=linux/x86_64 quay.io/redhat-cne/openshift-origin-release:base-rhel9-4.18 AS bin
COPY --from=builder /go/src/github.com/redhat-cne/cloud-event-proxy/build/cloud-event-proxy /
COPY --from=builder /go/src/github.com/redhat-cne/cloud-event-proxy/plugins/*.so /plugins/

Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require (
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.23.0
github.com/prometheus/client_golang v1.14.0
github.com/redhat-cne/rest-api v1.0.1-0.20240826142603-ec1368b90059
github.com/redhat-cne/sdk-go v1.0.1-0.20240826142227-273e2055e3b6
github.com/redhat-cne/rest-api v1.22.0
github.com/redhat-cne/sdk-go v1.22.0
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.1
golang.org/x/net v0.23.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -419,10 +419,10 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1
github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/redhat-cne/rest-api v1.0.1-0.20240826142603-ec1368b90059 h1:rAFTe1wWZd4DDSorW+GyAEkC4+Cs1rztWhsftUJ4ax0=
github.com/redhat-cne/rest-api v1.0.1-0.20240826142603-ec1368b90059/go.mod h1:E58NLd+ZilyJ5sYm7OPA9h44op1JzD7HxbM96N501ds=
github.com/redhat-cne/sdk-go v1.0.1-0.20240826142227-273e2055e3b6 h1:zj2dxxmn8eORTRSqFUWV4WQxnwhFJ8PBN0eu/odLnFI=
github.com/redhat-cne/sdk-go v1.0.1-0.20240826142227-273e2055e3b6/go.mod h1:q9LxxPbK1tGpDbQm/KIPujqdP0bK1hhuHrIXV3vuUrM=
github.com/redhat-cne/rest-api v1.22.0 h1:A0IbrLi07eYteFGimhmrOHVD6q1wk3kPKpG4oVAenrk=
github.com/redhat-cne/rest-api v1.22.0/go.mod h1:9Bb+edIo4zJ3/QUwgTWlwP/ZBbtGExxhnAzzLkQLtEA=
github.com/redhat-cne/sdk-go v1.22.0 h1:oAfCu9jjXLn3/aXASuccZCX1Vlz9iIV9pmuO4vy4dSk=
github.com/redhat-cne/sdk-go v1.22.0/go.mod h1:qeir05dwTscLvqGCIoQPCUM6HUoVmhR7521nXn28utA=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ github.com/prometheus/common/model
github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util
# github.com/redhat-cne/rest-api v1.0.1-0.20240826142603-ec1368b90059
# github.com/redhat-cne/rest-api v1.22.0
## explicit; go 1.22
github.com/redhat-cne/rest-api
github.com/redhat-cne/rest-api/pkg/localmetrics
github.com/redhat-cne/rest-api/pkg/restclient
github.com/redhat-cne/rest-api/v2
# github.com/redhat-cne/sdk-go v1.0.1-0.20240826142227-273e2055e3b6
# github.com/redhat-cne/sdk-go v1.22.0
## explicit; go 1.22
github.com/redhat-cne/sdk-go/pkg/channel
github.com/redhat-cne/sdk-go/pkg/common
Expand Down

0 comments on commit a0bc5d1

Please sign in to comment.