From 78f1dfd7d8718116349e1ebad27f7f6def431519 Mon Sep 17 00:00:00 2001
From: Felix Lange <fjl@twurst.com>
Date: Wed, 28 Sep 2022 23:43:59 +0200
Subject: [PATCH] build/bot: add linux build

---
 build/bot/Dockerfile.linux                         |  7 +++++++
 build/bot/{ppa-build.dockerfile => Dockerfile.ppa} |  2 --
 build/bot/linux-build.sh                           | 11 +++++++++++
 build/bot/ppa-build.sh                             |  5 +----
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 build/bot/Dockerfile.linux
 rename build/bot/{ppa-build.dockerfile => Dockerfile.ppa} (96%)
 create mode 100755 build/bot/linux-build.sh

diff --git a/build/bot/Dockerfile.linux b/build/bot/Dockerfile.linux
new file mode 100644
index 0000000000..8e566d3cfb
--- /dev/null
+++ b/build/bot/Dockerfile.linux
@@ -0,0 +1,7 @@
+FROM golang:v1.19.1
+
+# The repo checkout is mounted to /source.
+WORKDIR /source
+
+# Prevent git error because the owner of /source does not exist in the Docker container.
+RUN git config --global --add safe.directory /source
diff --git a/build/bot/ppa-build.dockerfile b/build/bot/Dockerfile.ppa
similarity index 96%
rename from build/bot/ppa-build.dockerfile
rename to build/bot/Dockerfile.ppa
index 5aefcd7ded..dcda640ad6 100644
--- a/build/bot/ppa-build.dockerfile
+++ b/build/bot/Dockerfile.ppa
@@ -12,5 +12,3 @@ WORKDIR /source
 
 # Prevent git error because the owner of /source does not exist in the Docker container.
 RUN git config --global --add safe.directory /source
-
-ENTRYPOINT build/bot/ppa-build.sh
diff --git a/build/bot/linux-build.sh b/build/bot/linux-build.sh
new file mode 100755
index 0000000000..1e908b0166
--- /dev/null
+++ b/build/bot/linux-build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e -x
+
+# Note: this script is meant to be run in a Debian/Ubuntu docker container, as user 'root'.
+
+# Build for the primary platforms that Trusty can manage
+go run build/ci.go install -dlgo
+go run build/ci.go archive -type tar -signer BUILD_LINUX_SIGNING_KEY -signify BUILD_SIGNIFY_KEY -upload gethstore/builds
+go run build/ci.go install -dlgo -arch 386
+go run build/ci.go archive -arch 386 -type tar -signer BUILD_LINUX_SIGNING_KEY -signify BUILD_SIGNIFY_KEY -upload gethstore/builds
diff --git a/build/bot/ppa-build.sh b/build/bot/ppa-build.sh
index 54d413af38..4b5d6bf1d1 100755
--- a/build/bot/ppa-build.sh
+++ b/build/bot/ppa-build.sh
@@ -2,9 +2,6 @@
 
 set -e -x
 
-# Note: this script is meant to be run in a Debian/Ubuntu docker container,
-# as user 'root'.
-
-env
+# Note: this script is meant to be run in a Debian/Ubuntu docker container, # as user 'root'.
 
 go run build/ci.go debsrc -sftp-user geth-ci -signer "Go Ethereum Linux Builder <geth-ci@ethereum.org>"