From 469ce5589b75ea129bae39862ec56e05f79beb87 Mon Sep 17 00:00:00 2001 From: Michael Muller Date: Tue, 28 Sep 2021 14:49:13 -0400 Subject: [PATCH] Use debian10 image for builder, not ubuntu1804 (#1345) The debian10 image is generally a bit more recent and, in particular, includes python 3.7.3, which we're currently using as a baseline for our builds. --- release/builder/Dockerfile | 2 +- release/builder/build.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/release/builder/Dockerfile b/release/builder/Dockerfile index 6da5663db..7f708956c 100644 --- a/release/builder/Dockerfile +++ b/release/builder/Dockerfile @@ -19,7 +19,7 @@ # 3. Google Cloud SDK for generating the WARs. # 4. Git to manipulate the private and the merged repos. # 5. Docker to build and push images. -FROM marketplace.gcr.io/google/ubuntu1804 +FROM marketplace.gcr.io/google/debian10 ENV DEBIAN_FRONTEND=noninteractive LANG=en_US.UTF-8 ADD ./build.sh . RUN ["bash", "./build.sh"] diff --git a/release/builder/build.sh b/release/builder/build.sh index 818c9a0bb..5852c57ff 100755 --- a/release/builder/build.sh +++ b/release/builder/build.sh @@ -27,6 +27,8 @@ apt-get install python -y # (introduced in 3.7) for nom_build apt-get install python3-pip -y python3 -m pip install dataclasses +# Install curl. +apt-get install curl -y # Install Node curl -sL https://deb.nodesource.com/setup_current.x | bash - apt-get install -y nodejs