all: upgrade nacl builders to pepper_44 and Kube

Updates golang/go#12379

Change-Id: I40bd6e37953bc509f557ff295374b51de550726c
Reviewed-on: https://go-review.googlesource.com/18946
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

dashboard/builders.go

@@ -412,6 +412,19 @@ func init() {
 		buildletURL: "http://storage.googleapis.com/go-builder-data/buildlet.linux-amd64",
 		env:         []string{"GOROOT_BOOTSTRAP=/go1.4", "GOOS=nacl", "GOARCH=amd64p32", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
 	})
+	addBuilder(BuildConfig{
+		Name:        "nacl-386-kube",
+		KubeImage:   "linux-x86-nacl:latest",
+		buildletURL: "http://storage.googleapis.com/go-builder-data/buildlet.linux-amd64",
+		env:         []string{"GOROOT_BOOTSTRAP=/go1.4", "GOOS=nacl", "GOARCH=386", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
+		//BuildletType: "nacl-amd64p32",
+	})
+	addBuilder(BuildConfig{
+		Name:        "nacl-amd64p32-kube",
+		KubeImage:   "linux-x86-nacl:latest",
+		buildletURL: "http://storage.googleapis.com/go-builder-data/buildlet.linux-amd64",
+		env:         []string{"GOROOT_BOOTSTRAP=/go1.4", "GOOS=nacl", "GOARCH=amd64p32", "GOHOSTOS=linux", "GOHOSTARCH=amd64"},
+	})
 	addBuilder(BuildConfig{
 		Name:           "openbsd-amd64-gce58",
 		Notes:          "OpenBSD 5.8; GCE VM is built from script in build/env/openbsd-amd64",

env/linux-x86-nacl/Dockerfile

@@ -7,14 +7,14 @@
 # We need more modern libc than Debian stable as used in base, so we're
 # using Debian sid instead.
 
-FROM gobuilders/linux-x86-sid
+FROM gcr.io/symbolic-datum-552/linux-x86-std:latest
 MAINTAINER golang-dev <golang-dev@googlegroups.com>
 
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
-RUN apt-get install -y --no-install-recommends bzip2
-RUN (cd /usr/bin && curl -s -O https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/39.0.2171.99/naclsdk_linux.tar.bz2 && tar xjf naclsdk_linux.tar.bz2 --strip-components=2 pepper_39/tools/sel_ldr_x86_32 pepper_39/tools/sel_ldr_x86_64 && rm naclsdk_linux.tar.bz2)
+RUN apt-get install -y --no-install-recommends bzip2 lib32stdc++6
+RUN (cd /usr/bin && curl -s -O https://storage.googleapis.com/nativeclient-mirror/nacl/nacl_sdk/44.0.2403.157/naclsdk_linux.tar.bz2 && tar xjf naclsdk_linux.tar.bz2 --strip-components=2 pepper_44/tools/sel_ldr_x86_32 pepper_44/tools/sel_ldr_x86_64 && rm naclsdk_linux.tar.bz2)
 
 ADD go_nacl_386_exec /usr/bin/
 ADD go_nacl_amd64p32_exec /usr/bin/

env/linux-x86-nacl/Makefile

@@ -1,16 +1,13 @@
-# Copyright 2014 The Go Authors. All rights reserved.
+# Copyright 2015 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.
+usage:
+	echo "Use staging or prod targets" ; exit 1
 
-docker: Dockerfile
-	docker build -t gobuilders/linux-x86-nacl .
-
-# TODO(bradfitz): test targets, using cmd/gomote and the buildlet in the container.
-
-# TODO(bradfitz): docs on how to build a new image. In a nutshell,
-#
-#    $ go install golang.org/x/build/cmd/docker2boot
-#    $ sudo docker2boot --image=gobuilders/linux-x86-nacl --out=linux-buildlet-nacl.tar.gz --gb=3
-#    $ gsutil cp -a public-read linux-buildlet-nacl.tar.gz gs://go-builder-data/linux-buildlet-nacl.tar.gz
-#    $ gcloud compute --project symbolic-datum-552 images create linux-buildlet-nacl --source-uri gs://go-builder-data/linux-buildlet-nacl.tar.gz
+staging: Dockerfile
+	docker build -t gcr.io/go-dashboard-dev/linux-x86-nacl:latest .
+	gcloud docker push gcr.io/go-dashboard-dev/linux-x86-nacl:latest
 
+prod: Dockerfile
+	docker build -t gcr.io/symbolic-datum-552/linux-x86-nacl:latest .
+	gcloud docker push gcr.io/symbolic-datum-552/linux-x86-nacl:latest

env/linux-x86-std-kube/Makefile

@@ -5,9 +5,9 @@ usage:
 	echo "Use staging or prod targets" ; exit 1
 
 staging: Dockerfile
-	docker build -t gcr.io/go-dashboard-dev/linux-buildlet-std:latest .
-	gcloud docker push gcr.io/go-dashboard-dev/linux-buildlet-std:latest
+	docker build -t gcr.io/go-dashboard-dev/linux-x86-std:latest .
+	gcloud docker push gcr.io/go-dashboard-dev/linux-x86-std:latest
 
 prod: Dockerfile
-	docker build -t gcr.io/symbolic-datum-552/linux-buildlet-std:latest .
-	gcloud docker push gcr.io/symbolic-datum-552/linux-buildlet-std:latest
+	docker build -t gcr.io/symbolic-datum-552/linux-x86-std:latest .
+	gcloud docker push gcr.io/symbolic-datum-552/linux-x86-std:latest