diff --git a/backend/build.sh b/backend/build.sh index a4d7fe8aa..049d6b8a4 100755 --- a/backend/build.sh +++ b/backend/build.sh @@ -9,23 +9,13 @@ # Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh set -e +source ../scripts/lib/_docker.sh + git_sha=$(git rev-parse --short HEAD) image_tag=${IMAGE_TAG:-$git_sha} ee="false" # Possible values: amd64, arm64 arch="${ARCH:-"amd64"}" -docker() { - local docker_cmd=${DOCKER_RUNTIME} - [[ $docker_cmd == "docker" ]] && docker_cmd=$(which docker) - if [[ "$1" == "build" ]]; then - shift - # Reconstruct command with DOCKER_ARGS before the '.' - $docker_cmd build "${DOCKER_BUILD_ARGS}" "$@" - else - $docker_cmd "$@" - fi -} - check_prereq() { which docker || { echo "Docker not installed, please install docker." diff --git a/scripts/lib/_docker.sh b/scripts/lib/_docker.sh new file mode 100644 index 000000000..134b9673a --- /dev/null +++ b/scripts/lib/_docker.sh @@ -0,0 +1,14 @@ +#!/bin/bash +docker() { + local docker_cmd=${DOCKER_RUNTIME} + [[ $docker_cmd == "docker" ]] && docker_cmd=$(which docker) + if [[ "$1" == "build" ]]; then + shift + # Reconstruct command with DOCKER_ARGS before the '.' + $docker_cmd build "${DOCKER_BUILD_ARGS}" "$@" + else + $docker_cmd "$@" + fi +} + +export -f docker