From 5ee68852c57b3d3419f568beac751cfb62b112e2 Mon Sep 17 00:00:00 2001
From: Anmol Sethi <anmol@terrastruct.com>
Date: Thu, 9 Feb 2023 19:50:18 -0800
Subject: [PATCH] docker/build.sh: More fixes

---
 ci/release/aws/ensure.sh   | 9 ++++++++-
 ci/release/build.sh        | 3 +++
 ci/release/docker/build.sh | 8 ++++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ci/release/aws/ensure.sh b/ci/release/aws/ensure.sh
index 8ee2afffb..d941273fa 100755
--- a/ci/release/aws/ensure.sh
+++ b/ci/release/aws/ensure.sh
@@ -331,6 +331,13 @@ sudo -E apt-get install -y docker-ce docker-ce-cli containerd.io docker-compose-
 sudo groupadd docker || true
 sudo usermod -aG docker \$USER
 
+printf %s '$CI_DOCKER_TOKEN' | docker login -u terrastruct --password-stdin
+# For building images cross platform.
+sudo -E apt-get install -y qemu qemu-user-static
+if docker buildx ls | grep -q 'default \*'; then
+  docker buildx create --use
+fi
+
 mkdir -p \$HOME/.local/bin
 mkdir -p \$HOME/.local/share/man
 EOF
@@ -387,7 +394,7 @@ init_remote_env() {
     sh_c ssh "$REMOTE_HOST" "sudo systemctl restart sshd"
     # ubuntu has $PATH hard coded in /etc/environment for some reason. It takes precedence
     # over ~/.ssh/environment.
-    sh_c ssh "$REMOTE_HOST" "sudo rm /etc/environment"
+    sh_c ssh "$REMOTE_HOST" "sudo rm -f /etc/environment"
   fi
 }
 
diff --git a/ci/release/build.sh b/ci/release/build.sh
index 944dea20e..63122b379 100755
--- a/ci/release/build.sh
+++ b/ci/release/build.sh
@@ -265,6 +265,9 @@ build_docker() {
 
   sh_c lockfile_ssh "$CI_D2_LINUX_AMD64" .d2-build-lock
   sh_c gitsync "$CI_D2_LINUX_AMD64" src/d2
+  sh_c rsync --archive --human-readable \
+    "$BUILD_DIR/d2-$VERSION"-linux-*.tar.gz \
+    "$CI_D2_LINUX_AMD64:src/d2/$BUILD_DIR/"
   sh_c ssh "$CI_D2_LINUX_AMD64" \
     "D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE-}" \
     "RELEASE=${RELEASE-}" \
diff --git a/ci/release/docker/build.sh b/ci/release/docker/build.sh
index 849712ffe..2b3477e24 100755
--- a/ci/release/docker/build.sh
+++ b/ci/release/docker/build.sh
@@ -42,8 +42,12 @@ main() {
   D2_DOCKER_IMAGE=${D2_DOCKER_IMAGE:-terrastruct/d2}
 
   sh_c mkdir -p "./ci/release/build/$VERSION/docker"
-  sh_c cp "./ci/release/build/$VERSION/d2-$VERSION"-linux-*.tar.gz "./ci/release/build/$VERSION/docker/"
-  sh_c cp ./ci/release/docker/entrypoint.sh "./ci/release/build/$VERSION/docker/entrypoint.sh"
+  sh_c cp \
+    "./ci/release/build/$VERSION/d2-$VERSION"-linux-*.tar.gz \
+    "./ci/release/build/$VERSION/docker/"
+  sh_c cp \
+    ./ci/release/docker/entrypoint.sh \
+    "./ci/release/build/$VERSION/docker/entrypoint.sh"
 
   flags='--load'
   if [ -n "${PUSH-}" -o -n "${RELEASE-}" ]; then