From db2efff9cea6e19cc2d79f7c632eb1b0e41f9030 Mon Sep 17 00:00:00 2001
From: coffeegoddd <dustin@dolthub.com>
Date: Thu, 11 Jul 2024 14:33:14 -0700
Subject: [PATCH] /docker/{Dockerfile,serverDockerfile}: change dolt
 installation to use install script which can determine platform

---
 docker/Dockerfile       | 12 ++++++------
 docker/serverDockerfile | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 31a9504a3b0..8df63476647 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,20 +1,20 @@
 # syntax=docker/dockerfile:1.3-labs
-FROM --platform=$BUILDPLATFORM ubuntu:22.04
+FROM ubuntu:22.04
 
 ARG DOLT_VERSION
-ARG BUILDARCH
 
 RUN apt update -y && \
     apt install -y \
+        curl \
         tini \
         ca-certificates && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 
-ADD https://github.com/dolthub/dolt/releases/download/v${DOLT_VERSION}/dolt-linux-${BUILDARCH}.tar.gz dolt-linux-${BUILDARCH}.tar.gz
-RUN tar zxvf dolt-linux-${BUILDARCH}.tar.gz && \
-    cp dolt-linux-${BUILDARCH}/bin/dolt /usr/local/bin && \
-    rm -rf dolt-linux-${BUILDARCH} dolt-linux-${BUILDARCH}.tar.gz
+# we install dolt with the install.sh script, which will determine the platform/arch of the container
+# and install the proper dolt binary
+RUN bash -c 'curl -L https://github.com/dolthub/dolt/releases/download/v${DOLT_VERSION}/install.sh | bash'
+RUN /usr/local/bin/dolt version
 
 WORKDIR /var/lib/dolt
 ENTRYPOINT ["tini", "--", "/usr/local/bin/dolt"]
diff --git a/docker/serverDockerfile b/docker/serverDockerfile
index 986f6c44499..adbaf05a072 100644
--- a/docker/serverDockerfile
+++ b/docker/serverDockerfile
@@ -1,20 +1,20 @@
 # syntax=docker/dockerfile:1.3-labs
-FROM --platform=$BUILDPLATFORM ubuntu:22.04
+FROM ubuntu:22.04
 
 ARG DOLT_VERSION
-ARG BUILDARCH
 
 RUN apt update -y && \
     apt install -y \
+        curl \
         tini \
         ca-certificates && \
     apt clean && \
     rm -rf /var/lib/apt/lists/*
 
-ADD https://github.com/dolthub/dolt/releases/download/v${DOLT_VERSION}/dolt-linux-${BUILDARCH}.tar.gz dolt-linux-${BUILDARCH}.tar.gz
-RUN tar zxvf dolt-linux-${BUILDARCH}.tar.gz && \
-    cp dolt-linux-${BUILDARCH}/bin/dolt /usr/local/bin && \
-    rm -rf dolt-linux-${BUILDARCH} dolt-linux-${BUILDARCH}.tar.gz
+# we install dolt with the install.sh script, which will determine the platform/arch of the container
+# and install the proper dolt binary
+RUN bash -c 'curl -L https://github.com/dolthub/dolt/releases/download/v${DOLT_VERSION}/install.sh | bash'
+RUN /usr/local/bin/dolt version
 
 RUN mkdir /docker-entrypoint-initdb.d
 VOLUME /var/lib/dolt