Skip to content

Commit

Permalink
fix: version specification for dolt
Browse files Browse the repository at this point in the history
  • Loading branch information
boukeversteegh committed Apr 3, 2022
1 parent a513126 commit 1bc2f79
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dockerized <command>
- tree
- zip
- Other utilities
- dolt
- youtube-dl (Youtube downloader)
- jq
- (latex)
Expand Down
16 changes: 14 additions & 2 deletions apps/dolt/build.sh
Original file line number Diff line number Diff line change
@@ -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

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
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 1bc2f79

Please sign in to comment.