env/crosscompile: update the three cross compile envs from Jessie to Buster
The earlier fix to remove IN_KUBERNETES in buildlet/stage0/stage0.go
in CL 201739 caused Kubernetes-based cross compilation builds on fail
to start up because I forgot to rebuild & push those container images.
But when I went to re-push them, I found they're too old (Debian
Jessie) and don't build anymore. So update them to Debian Buster.
While I'm here, remove the Debian release name from their image name,
as this won't be the last time we need to upgrade them. Unlike real
builders, the OS release isn't the point of these containers, as they
don't run tests. They exist only to do builds, so the OS isn't
interesting or worth calling out.
Updates golang/go#34956
Change-Id: Iee4691a821421b161a9333b4441f83ff45d1ffec
Reviewed-on: https://go-review.googlesource.com/c/build/+/202021
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
diff --git a/dashboard/builders.go b/dashboard/builders.go
index fa40c6b..e643fe6 100644
--- a/dashboard/builders.go
+++ b/dashboard/builders.go
@@ -135,14 +135,14 @@
SSHUsername: "root",
},
"host-linux-armhf-cross": &HostConfig{
- Notes: "Debian Jessie with armhf cross-compiler, built from env/crosscompile/linux-armhf-jessie",
- ContainerImage: "linux-armhf-jessie:latest",
+ Notes: "Debian with armhf cross-compiler, built from env/crosscompile/linux-armhf",
+ ContainerImage: "linux-armhf-cross:latest",
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
},
"host-linux-armel-cross": &HostConfig{
- Notes: "Debian Jessie with armel cross-compiler, from env/crosscompile/linux-armel-stretch",
- ContainerImage: "linux-armel-stretch:latest",
+ Notes: "Debian with armel cross-compiler, from env/crosscompile/linux-armel",
+ ContainerImage: "linux-armel-cross:latest",
buildletURLTmpl: "http://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
},
@@ -166,7 +166,7 @@
},
"host-s390x-cross-kube": &HostConfig{
Notes: "Container with s390x cross-compiler.",
- ContainerImage: "linux-s390x-stretch:latest",
+ ContainerImage: "linux-s390x-cross:latest",
buildletURLTmpl: "https://storage.googleapis.com/$BUCKET/buildlet.linux-amd64",
env: []string{"GOROOT_BOOTSTRAP=/go1.4"},
},
diff --git a/env/crosscompile/linux-armel-stretch/Dockerfile b/env/crosscompile/linux-armel-cross/Dockerfile
similarity index 90%
rename from env/crosscompile/linux-armel-stretch/Dockerfile
rename to env/crosscompile/linux-armel-cross/Dockerfile
index 4cdbee9..57e8ec4 100644
--- a/env/crosscompile/linux-armel-stretch/Dockerfile
+++ b/env/crosscompile/linux-armel-cross/Dockerfile
@@ -2,12 +2,12 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-# Linux builder VM running Debian stretch (i.e. Debian testing)
+# Debian buildlet image with cross compilers for linux-arm-arm5.
# Docker tag gobuilders/linux-armel-stretch
FROM golang/buildlet-stage0 AS stage0
-FROM debian:stretch
+FROM debian:buster
MAINTAINER golang-dev <golang-dev@googlegroups.com>
ENV DEBIAN_FRONTEND noninteractive
@@ -15,7 +15,7 @@
# curl: for getting and unpacking Go 1.4 source
# git-core: for interacting with the Go source & subrepos
# gcc, libc-dev: for building Go's bootstrap 'dist' prog
-# gcc-armel-linux-gnu, libc6-dev-armel-cross: for armel builds
+# gcc-arm-linux-gnueabi, libc6-dev-armel-cross: for armel builds
# linux-libc-dev(armel): for asm/errno.h
# procps, lsof, psmisc: misc tools
RUN dpkg --add-architecture armel \
diff --git a/env/crosscompile/linux-armel-stretch/Makefile b/env/crosscompile/linux-armel-cross/Makefile
similarity index 100%
rename from env/crosscompile/linux-armel-stretch/Makefile
rename to env/crosscompile/linux-armel-cross/Makefile
diff --git a/env/crosscompile/linux-armel-stretch/README b/env/crosscompile/linux-armel-cross/README
similarity index 100%
rename from env/crosscompile/linux-armel-stretch/README
rename to env/crosscompile/linux-armel-cross/README
diff --git a/env/crosscompile/linux-armhf-jessie/Dockerfile b/env/crosscompile/linux-armhf-cross/Dockerfile
similarity index 78%
rename from env/crosscompile/linux-armhf-jessie/Dockerfile
rename to env/crosscompile/linux-armhf-cross/Dockerfile
index 2aed9ce..05355a9 100644
--- a/env/crosscompile/linux-armhf-jessie/Dockerfile
+++ b/env/crosscompile/linux-armhf-cross/Dockerfile
@@ -2,21 +2,16 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-# Linux builder VM running Debian stretch (i.e. Debian testing)
-# Docker tag gobuilders/linux-armhf-stretch
+# Linux builder VM running Debian, with cross compilers for linux-arm.
+# Docker tag gobuilders/linux-armhf-cross
FROM golang/buildlet-stage0 AS stage0
-FROM debian:jessie
+FROM debian:buster
MAINTAINER golang-dev <golang-dev@googlegroups.com>
ENV DEBIAN_FRONTEND noninteractive
-# Add the Debian cross toolchains repository and key
-COPY emdebian-toolchain-archive.key /tmp/
-RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list \
- && apt-key add /tmp/emdebian-toolchain-archive.key
-
# git-core: for interacting with the Go source & subrepos
# gcc, libc-dev: for building Go's bootstrap 'dist' prog
# gcc-armhf-linux-gnu: for armhf builds
diff --git a/env/crosscompile/linux-armhf-jessie/Makefile b/env/crosscompile/linux-armhf-cross/Makefile
similarity index 100%
rename from env/crosscompile/linux-armhf-jessie/Makefile
rename to env/crosscompile/linux-armhf-cross/Makefile
diff --git a/env/crosscompile/linux-armhf-jessie/README b/env/crosscompile/linux-armhf-cross/README
similarity index 100%
rename from env/crosscompile/linux-armhf-jessie/README
rename to env/crosscompile/linux-armhf-cross/README
diff --git a/env/crosscompile/linux-armhf-jessie/emdebian-toolchain-archive.key b/env/crosscompile/linux-armhf-jessie/emdebian-toolchain-archive.key
deleted file mode 100644
index a4d3112..0000000
--- a/env/crosscompile/linux-armhf-jessie/emdebian-toolchain-archive.key
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-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
-V2JyGQ==
-=q84g
------END PGP PUBLIC KEY BLOCK-----
diff --git a/env/crosscompile/linux-s390x-stretch/Dockerfile b/env/crosscompile/linux-s390x-cross/Dockerfile
similarity index 91%
rename from env/crosscompile/linux-s390x-stretch/Dockerfile
rename to env/crosscompile/linux-s390x-cross/Dockerfile
index ea463ef..24a9f5b 100644
--- a/env/crosscompile/linux-s390x-stretch/Dockerfile
+++ b/env/crosscompile/linux-s390x-cross/Dockerfile
@@ -2,12 +2,12 @@
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
-# Linux builder VM running Debian stretch (i.e. Debian testing)
-# Docker tag gobuilders/linux-s390x-stretch
+# Linux buildlet image with with cross compilers for linux-s390x.
+# Docker tag gobuilders/linux-s390x-cross
FROM golang/buildlet-stage0 AS stage0
-FROM debian:stretch
+FROM debian:buster
MAINTAINER golang-dev <golang-dev@googlegroups.com>
ENV DEBIAN_FRONTEND noninteractive
diff --git a/env/crosscompile/linux-s390x-stretch/Makefile b/env/crosscompile/linux-s390x-cross/Makefile
similarity index 100%
rename from env/crosscompile/linux-s390x-stretch/Makefile
rename to env/crosscompile/linux-s390x-cross/Makefile
diff --git a/env/crosscompile/linux-s390x-stretch/README b/env/crosscompile/linux-s390x-cross/README
similarity index 100%
rename from env/crosscompile/linux-s390x-stretch/README
rename to env/crosscompile/linux-s390x-cross/README
