Revert "Install docker arm32 on arm64 boxes"

This reverts commit 01d98d7914.
This commit is contained in:
nicolas.dorier
2019-01-10 17:27:07 +09:00
parent 01d98d7914
commit 0a0379733d

View File

@@ -230,23 +230,11 @@ if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; t
2>error
fi
if ! [ -x "$(command -v docker)" ]; then
if [[ "$(uname -m)" == "x86_64" ]] || [[ "$(uname -m)" == "armv7l" ]]; then
echo "Trying to install docker..."
curl -fsSL https://get.docker.com -o get-docker.sh
chmod +x get-docker.sh
sh 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
echo "Trying to install docker..."
curl -fsSL https://get.docker.com -o get-docker.sh
chmod +x get-docker.sh
sh get-docker.sh
rm get-docker.sh
fi
if ! [ -x "$(command -v docker-compose)" ]; then
if [[ "$(uname -m)" == "x86_64" ]]; then