Make builder dockerfile to be x64 and aarch64 compatible (#2867)

* Make builder dockerfile to be x64 and aarch64 compatible
and building speed optimization

* remove hardcoded amd64
currently docker from edge not work, stable works, then stable instead edge

* libc6-dev-armhf-cross need to build rockchip uboot for helios64 under arm64

* need to add architecture to avoid blame for no docker for i386 arch

* hirsute uses same names for qemu-user-static

* let's only x64 use aptly from dev
This commit is contained in:
iav
2021-06-04 11:53:45 +03:00
committed by GitHub
parent 541dc71692
commit cda929a1b6
4 changed files with 33 additions and 20 deletions

View File

@@ -168,7 +168,7 @@ if [[ "${1}" == docker && -f /etc/debian_version && -z "$(command -v docker)" ]]
[[ "${codename}" == "hirsute" ]] && DOCKER_BINARY="docker containerd docker.io"
display_alert "Docker not installed." "Installing" "Info"
echo "deb [arch=amd64] https://download.docker.com/linux/${codeid} ${codename} edge" > /etc/apt/sources.list.d/docker.list
echo "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/${codeid} ${codename} stable" > /etc/apt/sources.list.d/docker.list
# minimal set of utilities that are needed for prep
packages=("curl" "gnupg")