aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitrios Apostolou <jimis@qt.io>2019-11-15 16:38:23 +0100
committerDimitrios Apostolou <jimis@qt.io>2020-01-13 19:44:45 +0100
commit302b228c7a726046f28f6899e5dcf60224d58707 (patch)
tree30597e14d026e232007995fb127ab3644a5189e7
parent14ad9b1387cec0526e01004d5452f8cf8e5c77ec (diff)
Do not try to double-install docker-ce-cli
That happened because docker-ce* was installing both docker-ce and docker-ce-cli, so apt was printing a warning. Change-Id: I0cad82243c8c3d5c0b9f26fc7b24673268259aa4 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rwxr-xr-xcoin/provisioning/common/linux/docker.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh
index 9ce8b73b..35089e41 100755
--- a/coin/provisioning/common/linux/docker.sh
+++ b/coin/provisioning/common/linux/docker.sh
@@ -52,8 +52,8 @@ do
DownloadURL $localRepo/$f $upstreamRepo/$f $sha
done
-sudo apt-get -y install ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
-rm -f ./containerd.io*.deb ./docker-ce*.deb ./docker-ce-cli*.deb
+sudo apt-get -y install ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
+rm -f ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb
sudo usermod -a -G docker $USER
sudo docker --version