From 1bc2f799b3b349b1f2eb92c828d2d18ba6c44d40 Mon Sep 17 00:00:00 2001
From: Bouke Versteegh <info@boukeversteegh.nl>
Date: Sun, 3 Apr 2022 16:07:40 +0200
Subject: [PATCH] fix: version specification for dolt

---
 .env               |  1 +
 README.md          |  1 +
 apps/dolt/build.sh | 16 ++++++++++++++--
 docker-compose.yml |  3 ++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 20bf36e..43b63bd 100644
--- a/.env
+++ b/.env
@@ -12,6 +12,7 @@ DEFAULT_BASE_IMAGE=alpine
 DEFAULT_BASE_IMAGE_VERSION=${ALPINE_VERSION}
 DEFAULT_BASE=${DEFAULT_BASE_IMAGE}:${DEFAULT_BASE_IMAGE_VERSION}
 DOCTL_VERSION=1.70.0
+DOLT_VERSION=0.37.9
 DOTNET_VERSION=6.0
 GIT_VERSION=2.32.0
 GH_VERSION=2.5.2
diff --git a/README.md b/README.md
index 1251eb7..8042333 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ dockerized <command>
   - tree
   - zip
 - Other utilities
+  - dolt 
   - youtube-dl (Youtube downloader)
   - jq
   - (latex)
diff --git a/apps/dolt/build.sh b/apps/dolt/build.sh
index 6420594..ce611c5 100644
--- a/apps/dolt/build.sh
+++ b/apps/dolt/build.sh
@@ -1,3 +1,15 @@
+#!/usr/bin/env bash
 DOLT_VERSION=$1
-apk add --no-cache bash curl
-wget -O - https://github.com/dolthub/dolt/releases/${DOLT_VERSION}/download/install.sh | bash
\ No newline at end of file
+
+set -e
+
+if [ -z "$DOLT_VERSION" ]; then
+  echo "$DOLT_VERSION not set"
+  exit 1
+fi
+
+if [ "$DOLT_VERSION" == "latest" ]; then
+  curl -L https://github.com/dolthub/dolt/releases/latest/download/install.sh | bash
+else
+  curl -L https://github.com/dolthub/dolt/releases/download/v${DOLT_VERSION}/install.sh | bash
+fi
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bdf1a4c..4f1fc98 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,12 +64,13 @@ services:
     volumes:
       - "${HOME:-home}/.dockerized/apps/doctl:/root"
   dolt:
-    image: "dockerized_dolt"
+    image: "dockerized_dolt:${DOLT_VERSION}"
     build:
       context: "${DOCKERIZED_ROOT:-.}/apps/dolt"
       dockerfile: "${DOCKERIZED_ROOT:-.}/apps/alpine/Dockerfile"
       args:
         ALPINE_VERSION: "${ALPINE_VERSION}"
+        ALPINE_PACKAGES: "bash curl"
         BUILD_SCRIPT_ARGS: "${DOLT_VERSION}"
     volumes:
       - "${DOCKERIZED_ROOT:-.}/apps/dolt/init.sh:/init.sh"