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

Jump to bottom

feat(image): add CI compatible Dockerfile #11

Merged
merged 8 commits into from
Dec 18, 2018
Merged

feat(image): add CI compatible Dockerfile #11

merged 8 commits into from
Dec 18, 2018

Conversation

njhale
Copy link
Member

@njhale njhale commented Dec 18, 2018 •
edited
Loading

Description

  • Adds CI compatible Dockerfile
  • Corrects package used for healthcheck in client
  • Adds missing fields to expected bundle in configmap test
  • Adds -count=1 to make test to prevent test result caching
  • Regenerates go.sum

@njhale njhale requested a review from ecordell December 18, 2018 12:39
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 18, 2018
@njhale njhale removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 18, 2018
ecordell
ecordell reviewed Dec 18, 2018
View reviewed changes
Dockerfile Outdated
RUN make static
RUN echo $(ls -la bin)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

Makefile Outdated

.PHONY: build test vendor clean

all: clean test build

$(CMDS):
go build -mod=vendor -tags json1 $(extra_flags) -o $@ ./cmd/$(shell basename $@)
CGO_ENABLE=0 go build $(MOD_FLAGS) -tags json1 $(extra_flags) -o $@ ./cmd/$(shell basename $@)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sqlite bindings require CGO: https://github.com/mattn/go-sqlite3#installation

pkg/client/client.go
@@ -15,31 +18,31 @@ type Interface interface {

type Client struct {
client api.RegistryClient
health api.HealthClient
conn *grpc.ClientConn
health grpc_health_v1.HealthClient
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops!

ecordell
ecordell approved these changes Dec 18, 2018
View reviewed changes
Copy link
Member

@ecordell ecordell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@njhale njhale merged commit 5e5e975 into operator-framework:master Dec 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ecordell ecordell ecordell approved these changes

Assignees
No one assigned
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@njhale @ecordell @openshift-ci-robot