maintner/maintnerd: stop using gitlock, use go modules

And update to multi-stage Dockerfiles, simplifying the build and
making it more consistent with others.

Updates golang/go#26872

Change-Id: If26e19d73c9bdb996343468cd1cff8edc574cb17
Reviewed-on: https://go-review.googlesource.com/c/build/+/176603
Reviewed-by: Dmitri Shuralyov <[email protected]>

Author: bradfitz

maintner/maintnerd/Dockerfile

@@ -1,7 +1,37 @@
 # Copyright 2017 The Go Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
-FROM debian:jessie
+
+FROM golang:1.12 AS build
+LABEL maintainer "[email protected]"
+
+ENV GO111MODULE=on
+ENV GOPROXY=https://proxy.golang.org
+
+RUN mkdir /gocache
+ENV GOCACHE /gocache
+
+COPY go.mod /go/src/golang.org/x/build/go.mod
+COPY go.sum /go/src/golang.org/x/build/go.sum
+
+WORKDIR /go/src/golang.org/x/build
+
+# Optimization for iterative docker build speed, not necessary for correctness:
+# TODO: write a tool to make writing Go module-friendly Dockerfiles easier.
+RUN go install cloud.google.com/go/compute/metadata
+RUN go install cloud.google.com/go/storage
+RUN go install golang.org/x/crypto/acme/autocert
+RUN go install golang.org/x/net/http2
+RUN go install golang.org/x/time/rate
+RUN go install grpc.go4.org
+
+COPY . /go/src/golang.org/x/build/
+WORKDIR /go/src/golang.org/x/build/
+
+RUN go install golang.org/x/build/maintner/maintnerd
+
+
+FROM debian:stretch
 LABEL maintainer "[email protected]"
 
 # For interacting with the Go source & subrepos
@@ -10,7 +40,7 @@ RUN apt-get update && apt-get install -y \
 	ca-certificates \
 	git-core \
 	openssh-client \
-	gnupg \
+	gnupg dirmngr \
 	&& rm -rf /var/lib/apt/lists/*
 
 # See https://github.com/golang/go/issues/23705
@@ -30,6 +60,5 @@ RUN mkdir -p ~/.ssh/ \
 	&& echo "|1|HygGkfOGLovavKfixjXWFJ7Yk1I=|lb/724row8KDTMC1dZiJlHyjxWM= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts \
 	&& chmod 0600 ~/.ssh/known_hosts
 
-COPY ca-certificates.crt /etc/ssl/certs/
-COPY maintnerd /
+COPY --from=build /go/bin/maintnerd /
 ENTRYPOINT ["/tini", "--", "/maintnerd"]

maintner/maintnerd/Dockerfile.0

@@ -11,28 +11,11 @@ IMAGE_PROD := gcr.io/symbolic-datum-552/maintnerd
 DOCKER_IMAGE_build0=build0/maintnerd:latest
 DOCKER_CTR_build0=maintnerd-build0
 
-build0: *.go Dockerfile.0
-	docker build --force-rm -f Dockerfile.0 --tag=$(DOCKER_IMAGE_build0) ../..
-
-maintnerd: build0
-	docker create --name $(DOCKER_CTR_build0) $(DOCKER_IMAGE_build0)
-	docker cp $(DOCKER_CTR_build0):/go/bin/$@ $@
-	docker rm $(DOCKER_CTR_build0)
-
-ca-certificates.crt:
-	docker create --name $(DOCKER_CTR_build0) $(DOCKER_IMAGE_build0)
-	docker cp $(DOCKER_CTR_build0):/etc/ssl/certs/$@ $@
-	docker rm $(DOCKER_CTR_build0)
-
-update-deps:
-	go install golang.org/x/build/cmd/gitlock
-	gitlock --update=Dockerfile.0 golang.org/x/build/maintner/maintnerd
-
-docker-prod: Dockerfile maintnerd ca-certificates.crt
-	docker build --force-rm --tag=$(IMAGE_PROD):$(VERSION) .
+docker-prod:
+	docker build --force-rm -f Dockerfile --tag=$(IMAGE_PROD):$(VERSION) ../..
 	docker tag $(IMAGE_PROD):$(VERSION) $(IMAGE_PROD):$(MUTABLE_VERSION)
-docker-staging: Dockerfile maintnerd ca-certificates.crt
-	docker build --force-rm --tag=$(IMAGE_STAGING):$(VERSION) .
+docker-staging:
+	docker build --force-rm -f Dockerfile --tag=$(IMAGE_STAGING):$(VERSION) ../..
 	docker tag $(IMAGE_STAGING):$(VERSION) $(IMAGE_STAGING):$(MUTABLE_VERSION)
 
 push-prod: docker-prod