Adding basic image generation targets.

Factored in feedback from mcrute.

Author: cheftako

Makefile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-.PHONY: gen clean certs build
+.PHONY: gen clean certs build docker/proxy-server docker/proxy-agent
 proto/agent/agent.pb.go: proto/agent/agent.proto
 	protoc -I proto proto/agent/agent.proto --go_out=plugins=grpc:proto
 
@@ -32,9 +32,19 @@ proto/proxy.pb.go: proto/proxy.proto
 bin/proxy-agent: bin cmd/agent/main.go proto/agent/agent.pb.go
 	go build -o bin/proxy-agent cmd/agent/main.go
 
+docker/proxy-agent: cmd/agent/main.go proto/agent/agent.pb.go
+	@[ "${REGISTRY}" ] || ( echo "REGISTRY is not set"; exit 1 )
+	@[ "${PROJECT_ID}" ] || ( echo "PROJECT_ID is not set"; exit 1 )
+	docker build . -f artifacts/images/agent-build.Dockerfile -t ${REGISTRY}/${PROJECT_ID}/proxy-agent:latest
+
 bin/proxy-server: bin cmd/proxy/main.go proto/agent/agent.pb.go proto/proxy.pb.go
 	go build -o bin/proxy-server cmd/proxy/main.go
 
+docker/proxy-server: cmd/proxy/main.go proto/agent/agent.pb.go proto/proxy.pb.go
+	@[ "${REGISTRY}" ] || ( echo "REGISTRY is not set"; exit 1 )
+	@[ "${PROJECT_ID}" ] || ( echo "PROJECT_ID is not set"; exit 1 )
+	docker build . -f artifacts/images/server-build.Dockerfile -t ${REGISTRY}/${PROJECT_ID}/server-proxy:latest
+
 bin/proxy-test-client: bin cmd/client/main.go proto/proxy.pb.go
 	go build -o bin/proxy-test-client cmd/client/main.go
 

README.md

@@ -17,12 +17,27 @@ Participation in the Kubernetes community is governed by the [Kubernetes Code of
 
 ## Build
 
+Please make sure you have the REGISTRY and PROJECT_ID environment variables set.
+For local builds these can be set to anything.
+For image builds these determine the location of your image.
+For GCE the registry should be gcr.io and PROJECT_ID should be the project you
+want to use the images in.
+
+### Local builds
+
 ```console
 make clean
 make certs
 make build
 ```
 
+### Build images
+
+```console
+build docker/proxy-server
+build docker/proxy-agent
+```
+
 ## Examples
 
 The current examples run two actual services as well as a sample client on one end and a sample destination for 

artifacts/images/agent-build.Dockerfile

@@ -0,0 +1,18 @@
+# Build the proxy-agent binary
+FROM golang:1.12.1 as builder
+
+# Copy in the go src
+WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy
+COPY pkg/    pkg/
+COPY cmd/    cmd/
+COPY proto/  proto/
+COPY vendor/ vendor/
+
+# Build
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o proxy-agent sigs.k8s.io/apiserver-network-proxy/cmd/agent
+
+# Copy the loader into a thin image
+FROM scratch
+WORKDIR /
+COPY --from=builder /go/src/sigs.k8s.io/apiserver-network-proxy/proxy-agent .
+ENTRYPOINT ["/proxy-agent"]

artifacts/images/server-build.Dockerfile

@@ -0,0 +1,18 @@
+# Build the proxy-server binary
+FROM golang:1.12.1 as builder
+
+# Copy in the go src
+WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy
+COPY pkg/    pkg/
+COPY cmd/    cmd/
+COPY proto/  proto/
+COPY vendor/ vendor/
+
+# Build
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o proxy-server sigs.k8s.io/apiserver-network-proxy/cmd/proxy
+
+# Copy the loader into a thin image
+FROM scratch
+WORKDIR /
+COPY --from=builder /go/src/sigs.k8s.io/apiserver-network-proxy/proxy-server .
+ENTRYPOINT ["/proxy-server"]