beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #38658 from thaJeztah/use_stable_cli

Browse source 
Use 17.06 stable channel for CLI used in CI
This commit is contained in:
Sebastiaan van Stijn 2019-01-31 18:58:55 +01:00 committed by GitHub
commit fc4a40b510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hack/dockerfile/install/dockercli.installer
View file

@ -1,22 +1,22 @@
#!/bin/sh
DOCKERCLI_CHANNEL=${DOCKERCLI_CHANNEL:-edge}
DOCKERCLI_VERSION=${DOCKERCLI_VERSION:-17.06.0-ce}
DOCKERCLI_CHANNEL=${DOCKERCLI_CHANNEL:-stable}
DOCKERCLI_VERSION=${DOCKERCLI_VERSION:-17.06.2-ce}
install_dockercli() {
echo "Install docker/cli version $DOCKERCLI_VERSION from $DOCKERCLI_CHANNEL"
arch=$(uname -m)
# No official release of these platforms
if [ "$arch" != "x86_64" ] && [ "$arch" != "s390x" ]; then
if [ "$arch" != "x86_64" ] && [ "$arch" != "s390x" ] && [ "$arch" != "armhf" ]; then
build_dockercli
return
fi
url=https://download.docker.com/linux/static
curl -Ls "${url}/${DOCKERCLI_CHANNEL}/${arch}/docker-${DOCKERCLI_VERSION}.tgz" | tar -xz docker/docker
mkdir -p ${PREFIX}
mv docker/docker ${PREFIX}/
mkdir -p "${PREFIX}"
mv docker/docker "${PREFIX}/"
rmdir docker
}

4
hack/make.ps1
View file

@ -394,8 +394,8 @@ Try {
if ($Daemon) { Execute-Build "daemon" "daemon" "dockerd" }
if ($Client) {
# Get the Docker channel and version from the environment, or use the defaults.
if (-not ($channel = $env:DOCKERCLI_CHANNEL)) { $channel = "edge" }
if (-not ($version = $env:DOCKERCLI_VERSION)) { $version = "17.06.0-ce" }
if (-not ($channel = $env:DOCKERCLI_CHANNEL)) { $channel = "stable" }
if (-not ($version = $env:DOCKERCLI_VERSION)) { $version = "17.06.2-ce" }
# Download the zip file and extract the client executable.
Write-Host "INFO: Downloading docker/cli version $version from $channel..."