From 8109dfb44b1ee9133157343a7fd7fb787a784054 Mon Sep 17 00:00:00 2001
From: Luke Gehorsam <luke@heroiclabs.com>
Date: Fri, 8 Mar 2024 08:58:17 -0500
Subject: [PATCH] update dockerfile for linux builds (#156)

---
 scripts/Dockerfile | 12 ++++++++++--
 scripts/build.sh   |  4 +---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 72e10c302..11864ed84 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -1,10 +1,12 @@
 # syntax=docker/dockerfile:1.4
-ARG UBUNTU_BASE=ubuntu:18.04
+ARG UBUNTU_BASE=ubuntu:20.04
 FROM $UBUNTU_BASE
 
+ENV DEBIAN_FRONTEND=noninteractive
+
 RUN rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
-  apt update && apt-get install --no-install-recommends -y libc-dev curl zip unzip ca-certificates busybox git-core pkg-config software-properties-common
+  apt update && apt-get install --no-install-recommends -y libc-dev curl zip unzip ca-certificates busybox git-core pkg-config software-properties-common make
 
 RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt <<EOT bash -ue
  mkdir -p /opt/cmake /opt/ninja
@@ -16,6 +18,12 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
  apt install -y g++-11 python3-distutils
 EOT
 
+RUN <<EOT bash -ue
+ git clone https://github.com/microsoft/vcpkg.git
+EOT
+
+ENV VCPKG_ROOT=/vcpkg
+
 ARG CMAKE_ARGS=""
 
 ENV CC=/usr/bin/gcc-11 CXX=/usr/bin/g++-11
diff --git a/scripts/build.sh b/scripts/build.sh
index 23cd70b69..98cdc9bc0 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-
-
-exec docker build -f $(dirname $0)/Dockerfile --progress=plain $(dirname $0)/.. --output ${1:?pass output directory as first argument}
+exec docker buildx build --platform linux/amd64 -f $(dirname $0)/Dockerfile --progress=tty $(dirname $0)/.. --output ${1:?pass output directory as first argument}