enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

armbian-next: docker: don't try to double init when recovering from failed pull

Browse Source
This commit is contained in:
Ricardo Pardini 2022-12-21 17:13:53 +01:00
parent 7842113c1d
commit 39ac9e00b1
No known key found for this signature in database
GPG Key ID: 3D38CA12A66C5D02
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/functions/host/docker.sh
View File

@ -109,8 +109,11 @@ function docker_cli_prepare() {
#############################################################################################################
# Prepare some dependencies; these will be used on the Dockerfile
enable_all_extensions_builtin_and_user
initialize_extension_manager # initialize the extension manager.
# initialize the extension manager; enable all extensions; only once..
if [[ "${docker_prepare_cli_skip_exts:-no}" != "yes" ]]; then
enable_all_extensions_builtin_and_user
initialize_extension_manager
fi
declare -a -g host_dependencies=() python3_pip_dependencies=()
early_prepare_pip3_dependencies_for_python_tools
early_prepare_host_dependencies
@ -272,7 +275,7 @@ function docker_cli_build_dockerfile() {
display_alert "Base image not in local cache, building from scratch" "${DOCKER_ARMBIAN_BASE_IMAGE}" "info"
export DOCKERFILE_USE_ARMBIAN_IMAGE_AS_BASE=no
export DOCKER_ARMBIAN_BASE_IMAGE="${DOCKER_ARMBIAN_BASE_IMAGE_SCRATCH}"
docker_cli_prepare
docker_prepare_cli_skip_exts="yes" docker_cli_prepare
display_alert "Re-created" "Dockerfile, proceeding, build from scratch" "debug"
fi