kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Use 17.06 stable channel for CLI used in CI 

Update to the latest patch release of 17.06.2. This
keeps the same API requirements.

This also enables pre-built binaries for armhf instead
of compiling from source.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-01-13 21:38:00 +01:00
parent 5a2f15b5d5
commit 468eb93e5a
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
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 #!/bin/sh
DOCKERCLI_CHANNEL=${DOCKERCLI_CHANNEL:-edge} DOCKERCLI_CHANNEL=${DOCKERCLI_CHANNEL:-stable}
DOCKERCLI_VERSION=${DOCKERCLI_VERSION:-17.06.0-ce} DOCKERCLI_VERSION=${DOCKERCLI_VERSION:-17.06.2-ce}
install_dockercli() { install_dockercli() {
echo "Install docker/cli version $DOCKERCLI_VERSION from $DOCKERCLI_CHANNEL" echo "Install docker/cli version $DOCKERCLI_VERSION from $DOCKERCLI_CHANNEL"
arch=$(uname -m) arch=$(uname -m)
# No official release of these platforms # No official release of these platforms
if [ "$arch" != "x86_64" ] && [ "$arch" != "s390x" ]; then if [ "$arch" != "x86_64" ] && [ "$arch" != "s390x" ] && [ "$arch" != "armhf" ]; then
build_dockercli build_dockercli
return return
fi fi
url=https://download.docker.com/linux/static url=https://download.docker.com/linux/static
curl -Ls "${url}/${DOCKERCLI_CHANNEL}/${arch}/docker-${DOCKERCLI_VERSION}.tgz" | tar -xz docker/docker curl -Ls "${url}/${DOCKERCLI_CHANNEL}/${arch}/docker-${DOCKERCLI_VERSION}.tgz" | tar -xz docker/docker
mkdir -p ${PREFIX} mkdir -p "${PREFIX}"
mv docker/docker ${PREFIX}/ mv docker/docker "${PREFIX}/"
rmdir docker rmdir docker
} }

4
hack/make.ps1
View File

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