diff --git a/build-system/scripts/build b/build-system/scripts/build index f02824c7928..e01ce5d8266 100755 --- a/build-system/scripts/build +++ b/build-system/scripts/build @@ -65,7 +65,7 @@ echo "Content hash: $CONTENT_HASH" cd $BUILD_DIR -ensure_apt_package docker-buildx-plugin +ensure_docker_buildx docker buildx create --name multi-platform-builder --bootstrap --use # If we have previously successful commit, we can early out if nothing relevant has changed since. diff --git a/build-system/scripts/ensure_apt_package b/build-system/scripts/ensure_apt_package index d1f328e50e2..33326c7f1fd 100755 --- a/build-system/scripts/ensure_apt_package +++ b/build-system/scripts/ensure_apt_package @@ -6,5 +6,4 @@ if dpkg -s $1 &> /dev/null; then fi >&2 echo "Installing $1..." -#sudo apt update &> /dev/null && sudo apt install --force-yes $1 &> /dev/null -sudo apt install --force-yes $1 +sudo apt update &> /dev/null && sudo apt install --force-yes $1 &> /dev/null diff --git a/build-system/scripts/ensure_docker_repo b/build-system/scripts/ensure_docker_buildx similarity index 90% rename from build-system/scripts/ensure_docker_repo rename to build-system/scripts/ensure_docker_buildx index 806d6debc60..c9416cbd00d 100755 --- a/build-system/scripts/ensure_docker_repo +++ b/build-system/scripts/ensure_docker_buildx @@ -13,4 +13,5 @@ echo \ "deb [arch="$(dpkg --print-architecture)" signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \ "$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \ sudo tee /etc/apt/sources.list.d/docker.list > /dev/null -sudo apt-get update \ No newline at end of file +sudo apt-get update +sudo apt-get install docker-buildx-plugin \ No newline at end of file