Revert "Install docker arm32 on arm64 boxes"
This reverts commit 01d98d7914.
This commit is contained in:
@@ -230,23 +230,11 @@ if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; t
|
|||||||
2>error
|
2>error
|
||||||
fi
|
fi
|
||||||
if ! [ -x "$(command -v docker)" ]; then
|
if ! [ -x "$(command -v docker)" ]; then
|
||||||
if [[ "$(uname -m)" == "x86_64" ]] || [[ "$(uname -m)" == "armv7l" ]]; then
|
echo "Trying to install docker..."
|
||||||
echo "Trying to install docker..."
|
curl -fsSL https://get.docker.com -o get-docker.sh
|
||||||
curl -fsSL https://get.docker.com -o get-docker.sh
|
chmod +x get-docker.sh
|
||||||
chmod +x get-docker.sh
|
sh get-docker.sh
|
||||||
sh get-docker.sh
|
rm get-docker.sh
|
||||||
rm get-docker.sh
|
|
||||||
else if [[ "$(uname -m)" == "aarch64" ]]; then
|
|
||||||
echo "Trying to install docker for armv7 on a aarch64 board..."
|
|
||||||
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
|
|
||||||
RELEASE=$(lsb_release -cs)
|
|
||||||
if [[ "$RELEASE" == "bionic" ]]; then
|
|
||||||
RELEASE=xenial
|
|
||||||
fi
|
|
||||||
add-apt-repository "deb https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $RELEASE stable"
|
|
||||||
apt-get update -y
|
|
||||||
apt-get install -y docker-ce:armhf
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
if ! [ -x "$(command -v docker-compose)" ]; then
|
if ! [ -x "$(command -v docker-compose)" ]; then
|
||||||
if [[ "$(uname -m)" == "x86_64" ]]; then
|
if [[ "$(uname -m)" == "x86_64" ]]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user