From d63caac6a8f19aaf8077209f4cfe645753c68ee4 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Wed, 16 Nov 2022 08:24:21 -0800
Subject: [PATCH] ci/release/builders: Switch to Debian 11 for linux builders
 host OS

---
 ci/release/builders/aws_ensure.sh | 45 ++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/ci/release/builders/aws_ensure.sh b/ci/release/builders/aws_ensure.sh
index c82d68fdb..3a875d832 100755
--- a/ci/release/builders/aws_ensure.sh
+++ b/ci/release/builders/aws_ensure.sh
@@ -77,7 +77,7 @@ create_remote_hosts() {
     | jq -r '.Reservations[].Instances[].State.Name')
   if [ -z "$state" ]; then
     sh_c aws ec2 run-instances \
-      --image-id=ami-0d593311db5abb72b \
+      --image-id=ami-071e6cafc48327ca2 \
       --count=1 \
       --instance-type=t2.small \
       --security-groups=ssh \
@@ -90,8 +90,8 @@ create_remote_hosts() {
       --filters 'Name=instance-state-name,Values=pending,running,stopping,stopped' 'Name=tag:Name,Values=d2-builder-linux-amd64' \
       | jq -r '.Reservations[].Instances[].PublicDnsName')
     if [ -n "$dnsname" ]; then
-      log "TSTRUCT_LINUX_AMD64_BUILDER=ec2-user@$dnsname"
-      export TSTRUCT_LINUX_AMD64_BUILDER=ec2-user@$dnsname
+      log "TSTRUCT_LINUX_AMD64_BUILDER=admin@$dnsname"
+      export TSTRUCT_LINUX_AMD64_BUILDER=admin@$dnsname
       break
     fi
     sleep 5
@@ -103,7 +103,7 @@ create_remote_hosts() {
     | jq -r '.Reservations[].Instances[].State.Name')
   if [ -z "$state" ]; then
     sh_c aws ec2 run-instances \
-      --image-id=ami-0efabcf945ffd8831 \
+      --image-id=ami-0e67506f183e5ab60 \
       --count=1 \
       --instance-type=t4g.small \
       --security-groups=ssh \
@@ -116,8 +116,8 @@ create_remote_hosts() {
       --filters 'Name=instance-state-name,Values=pending,running,stopping,stopped' 'Name=tag:Name,Values=d2-builder-linux-arm64' \
       | jq -r '.Reservations[].Instances[].PublicDnsName')
     if [ -n "$dnsname" ]; then
-      log "TSTRUCT_LINUX_ARM64_BUILDER=ec2-user@$dnsname"
-      export TSTRUCT_LINUX_ARM64_BUILDER=ec2-user@$dnsname
+      log "TSTRUCT_LINUX_ARM64_BUILDER=admin@$dnsname"
+      export TSTRUCT_LINUX_ARM64_BUILDER=admin@$dnsname
       break
     fi
     sleep 5
@@ -218,11 +218,32 @@ init_remote_linux() {
     fi
     sleep 5
   done
-  sh_c ssh "$REMOTE_HOST" 'sudo yum upgrade -y'
-  sh_c ssh "$REMOTE_HOST" 'sudo yum install -y docker'
-  sh_c ssh "$REMOTE_HOST" 'sudo systemctl start docker'
-  sh_c ssh "$REMOTE_HOST" 'sudo systemctl enable docker'
-  sh_c ssh "$REMOTE_HOST" 'sudo usermod -a -G docker ec2-user'
+
+  sh_c ssh "$REMOTE_HOST" sh -s -- <<EOF
+set -eux
+export DEBIAN_FRONTEND=noninteractive
+
+sudo -E apt-get update -y
+sudo -E apt-get dist-upgrade -y
+sudo -E apt-get install -y build-essential rsync
+
+# Docker from https://docs.docker.com/engine/install/debian/
+sudo -E apt-get -y install \
+    ca-certificates \
+    curl \
+    gnupg \
+    lsb-release
+sudo mkdir -p /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --batch --yes --dearmor -o /etc/apt/keyrings/docker.gpg
+echo \
+  "deb [arch=\$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian \
+  \$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo -E apt-get update -y
+sudo -E apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+sudo groupadd docker || true
+sudo usermod -aG docker \$USER
+EOF
+
   sh_c ssh "$REMOTE_HOST" 'sudo reboot' || true
 }
 
@@ -233,7 +254,7 @@ init_remote_macos() {
     fi
     sleep 5
   done
-  sh_c ssh "$REMOTE_HOST" '": | /bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""'
+  sh_c ssh "$REMOTE_HOST" '"/bin/bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)\""'
   sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew update'
   sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew upgrade'
   sh_c ssh "$REMOTE_HOST" 'PATH="/usr/local/bin:/opt/homebrew/bin:\$PATH" brew install go'