feat(builder): add builder dockerfile (contains tools for building a

registry image)

intended to be used as a parent image for upstream catalogs

Author: ecordell

Dockerfile

@@ -13,7 +13,7 @@ COPY vendor vendor
 COPY cmd cmd
 COPY pkg pkg
 COPY Makefile Makefile
-RUN make static
+RUN make static-rh
 
 # copy and build vendored grpc_health_probe
 RUN mkdir -p /go/src/github.com/grpc-ecosystem && \

Makefile

@@ -1,5 +1,5 @@
-CMDS  := $(addprefix bin/, $(shell go list ./cmd/... | xargs -I{} basename {}))
-MOD_FLAGS := $(shell (go version | grep -q 1.11) && echo -mod=vendor)
+MOD_FLAGS := $(shell (go version | grep -q -E "1\.(11|12)") && echo -mod=vendor)
+CMDS  := $(addprefix bin/, $(shell go list $(MOD_FLAGS) ./cmd/... | xargs -I{} basename {}))
 
 .PHONY: build test vendor clean
 
@@ -10,9 +10,12 @@ $(CMDS):
 
 build: clean $(CMDS)
 
-static: extra_flags=-ldflags '-w -extldflags "-Wl,-Bstatic -ldl -lc -lpthread -lcrypto -lz -static"'
+static: extra_flags=-ldflags '-w -extldflags "-static"'
 static: build
 
+static-rh: extra_flags=-ldflags '-w -extldflags "-Wl,-Bstatic -ldl -lc -lpthread -lcrypto -lz -static"'
+static-rh: build
+
 unit:
 	go test $(MOD_FLAGS) -count=1 --tags json1 -v -race ./pkg/...
 

go.mod

@@ -29,7 +29,6 @@ require (
 	github.com/operator-framework/go-appr v0.0.0-20180917210448-f2aef88446f2
 	github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190125151539-1e295784b30a
 	github.com/operator-framework/operator-marketplace v0.0.0-20190216021216-57300a3ef3ba
-	github.com/prometheus/common v0.0.0-20190104105734-b1c43a6df3ae
 	github.com/sirupsen/logrus v1.2.0
 	github.com/soheilhy/cmux v0.1.4 // indirect
 	github.com/spf13/cobra v0.0.3
@@ -38,6 +37,7 @@ require (
 	github.com/ugorji/go v1.1.1 // indirect
 	golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
 	golang.org/x/oauth2 v0.0.0-20181105165119-ca4130e427c7 // indirect
+	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
 	golang.org/x/tools v0.0.0-20181207222222-4c874b978acb // indirect
 	google.golang.org/grpc v1.17.0
 	k8s.io/api v0.0.0-20190118113203-912cbe2bfef3

go.sum

@@ -207,6 +207,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c h1:fqgJT0MGcGpPgpWU7VRdRjuArfcOvC4AoJmILihzhDg=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ=
+golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181011152555-a398e557df60/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181207222222-4c874b978acb/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

upstream-builder.Dockerfile

@@ -0,0 +1,14 @@
+FROM golang:1.12-alpine
+
+RUN apk update && apk add sqlite build-base git mercurial
+WORKDIR /build
+
+COPY vendor vendor
+COPY cmd cmd
+COPY pkg pkg
+COPY Makefile Makefile
+COPY go.mod go.mod
+RUN make static
+RUN GRPC_HEALTH_PROBE_VERSION=v0.2.1 && \
+    wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
+    chmod +x /bin/grpc_health_probe

upstream-example.Dockerfile

@@ -1,33 +1,12 @@
-FROM golang:1.11-alpine as builder
-
-RUN apk update && apk add sqlite build-base git mercurial
-WORKDIR /build
-
-COPY vendor vendor
-COPY cmd cmd
-COPY pkg pkg
-COPY Makefile Makefile
-COPY go.mod go.mod
-RUN make static
+FROM quay.io/operator-framework/upstream-registry-builder as builder
 
 COPY manifests manifests
 RUN ./bin/initializer -o ./bundles.db
 
-FROM golang:1.10-alpine as probe-builder
-
-RUN apk update && apk add build-base git
-ENV ORG github.com/grpc-ecosystem
-ENV PROJECT $ORG/grpc_health_probe
-WORKDIR /go/src/$PROJECT
-
-COPY --from=builder /build/vendor/$ORG/grpc-health-probe .
-COPY --from=builder /build/vendor .
-RUN CGO_ENABLED=0 go install -a -tags netgo -ldflags "-w"
-
 FROM scratch
 COPY --from=builder /build/bundles.db /bundles.db
 COPY --from=builder /build/bin/registry-server /registry-server
-COPY --from=probe-builder /go/bin/grpc_health_probe /bin/grpc_health_probe
+COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
 EXPOSE 50051
 ENTRYPOINT ["/registry-server"]
 CMD ["--database", "bundles.db"]

vendor/modules.txt

@@ -145,7 +145,7 @@ golang.org/x/text/unicode/bidi
 golang.org/x/text/unicode/norm
 golang.org/x/text/transform
 golang.org/x/text/width
-# golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
+# golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 golang.org/x/time/rate
 # google.golang.org/genproto v0.0.0-20181016170114-94acd270e44e
 google.golang.org/genproto/googleapis/rpc/status