mirror of
https://github.com/DrewThomasson/ebook2audiobook.git
synced 2026-01-09 22:08:13 -05:00
...
This commit is contained in:
@@ -680,18 +680,18 @@ function build_docker_image {
|
||||
esac
|
||||
ISO3_LANG="$(get_iso3_lang $OS_LANG)"
|
||||
DOCKER_IMG_NAME="${DOCKER_IMG_NAME}:${TAG}"
|
||||
if docker compose version >/dev/null 2>&1; then
|
||||
BUILD_NAME="$DOCKER_IMG_NAME" docker compose \
|
||||
--progress plain \
|
||||
build \
|
||||
--no-cache \
|
||||
--build-arg PYTHON_VERSION="$py_vers" \
|
||||
--build-arg DOCKER_DEVICE_STR="$ARG" \
|
||||
--build-arg DOCKER_PROGRAMS_STR="${DOCKER_PROGRAMS[*]}" \
|
||||
--build-arg CALIBRE_INSTALLER_URL="$CALIBRE_INSTALLER_URL" \
|
||||
--build-arg ISO3_LANG="$ISO3_LANG" \
|
||||
|| return 1
|
||||
else
|
||||
#if docker compose version >/dev/null 2>&1; then
|
||||
# BUILD_NAME="$DOCKER_IMG_NAME" docker compose \
|
||||
# --progress plain \
|
||||
# build \
|
||||
# --no-cache \
|
||||
# --build-arg PYTHON_VERSION="$py_vers" \
|
||||
# --build-arg DOCKER_DEVICE_STR="$ARG" \
|
||||
# --build-arg DOCKER_PROGRAMS_STR="${DOCKER_PROGRAMS[*]}" \
|
||||
# --build-arg CALIBRE_INSTALLER_URL="$CALIBRE_INSTALLER_URL" \
|
||||
# --build-arg ISO3_LANG="$ISO3_LANG" \
|
||||
# || return 1
|
||||
#else
|
||||
docker build \
|
||||
--no-cache \
|
||||
--progress plain \
|
||||
@@ -702,7 +702,7 @@ function build_docker_image {
|
||||
--build-arg ISO3_LANG="$ISO3_LANG" \
|
||||
-t "$DOCKER_IMG_NAME" \
|
||||
. || return 1
|
||||
fi
|
||||
#fi
|
||||
if [[ -n "$cmd_options" ]]; then
|
||||
cmd_extra="$cmd_options "
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user