Merge branch '2.1.x' into 2.2.x

Closes gh-20421
This commit is contained in:
Stephane Nicoll 2020-03-08 12:01:23 +01:00
commit 3152971ad1

View File

@ -29,7 +29,7 @@ test -f /opt/openjdk/bin/javac
###########################################################
cd /
curl -L https://download.docker.com/linux/static/stable/x86_64/docker-19.03.5.tgz | tar zx
curl -L https://download.docker.com/linux/static/stable/x86_64/docker-19.03.7.tgz | tar zx
mv /docker/* /bin/
chmod +x /bin/docker*