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

Merge pull request #18837 from thaJeztah/remove-darwin-i386

Browse source 
Don't build Darwin 32-bit binaries
This commit is contained in:
Jess Frazelle 2015-12-22 09:51:29 -08:00
commit ff796e5bf7
4 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -91,7 +91,7 @@ ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
# Compile Go for cross compilation # Compile Go for cross compilation
ENV DOCKER_CROSSPLATFORMS \ ENV DOCKER_CROSSPLATFORMS \
linux/386 linux/arm \ linux/386 linux/arm \
darwin/amd64 darwin/386 \ darwin/amd64 \
freebsd/amd64 freebsd/386 freebsd/arm \ freebsd/amd64 freebsd/386 freebsd/arm \
windows/amd64 windows/386 windows/amd64 windows/386

18
docs/installation/binaries.md
View file

@ -121,9 +121,9 @@ following URL patterns:
For example: For example:
https://get.docker.com/builds/Linux/i386/docker-1.6.0 https://get.docker.com/builds/Linux/i386/docker-1.9.1
https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 https://get.docker.com/builds/Linux/x86_64/docker-1.9.1
### Get the Mac OS X binary ### Get the Mac OS X binary
@ -131,26 +131,20 @@ For example:
The Mac OS X binary is only a client. You cannot use it to run the `docker` The Mac OS X binary is only a client. You cannot use it to run the `docker`
daemon. To download the latest version for Mac OS X, use the following URLs: daemon. To download the latest version for Mac OS X, use the following URLs:
https://get.docker.com/builds/Darwin/i386/docker-latest
https://get.docker.com/builds/Darwin/x86_64/docker-latest https://get.docker.com/builds/Darwin/x86_64/docker-latest
To download a specific version for Mac OS X, use the To download a specific version for Mac OS X, use the
following URL patterns: following URL patterns:
https://get.docker.com/builds/Darwin/i386/docker-<version>
https://get.docker.com/builds/Darwin/x86_64/docker-<version> https://get.docker.com/builds/Darwin/x86_64/docker-<version>
For example: For example:
https://get.docker.com/builds/Darwin/i386/docker-1.6.0 https://get.docker.com/builds/Darwin/x86_64/docker-1.9.1
https://get.docker.com/builds/Darwin/x86_64/docker-1.6.0
### Get the Windows binary ### Get the Windows binary
You can only download the Windows client binary for version `1.6.0` onwards. You can only download the Windows client binary for version `1.9.1` onwards.
Moreover, the binary is only a client, you cannot use it to run the `docker` daemon. Moreover, the binary is only a client, you cannot use it to run the `docker` daemon.
To download the latest version for Windows, use the following URLs: To download the latest version for Windows, use the following URLs:
@ -166,9 +160,9 @@ To download a specific version for Windows, use the following URL pattern:
For example: For example:
https://get.docker.com/builds/Windows/i386/docker-1.6.0.exe https://get.docker.com/builds/Windows/i386/docker-1.9.1.exe
https://get.docker.com/builds/Windows/x86_64/docker-1.6.0.exe https://get.docker.com/builds/Windows/x86_64/docker-1.9.1.exe
## Run the Docker daemon ## Run the Docker daemon

1
hack/release.sh
View file

@ -318,7 +318,6 @@ echo "We have just pushed $VERSION to $(s3_url). You can download it with the fo
echo echo
echo "Linux 64bit binary: $(s3_url)/builds/Linux/x86_64/docker-$VERSION" echo "Linux 64bit binary: $(s3_url)/builds/Linux/x86_64/docker-$VERSION"
echo "Darwin/OSX 64bit client binary: $(s3_url)/builds/Darwin/x86_64/docker-$VERSION" echo "Darwin/OSX 64bit client binary: $(s3_url)/builds/Darwin/x86_64/docker-$VERSION"
echo "Darwin/OSX 32bit client binary: $(s3_url)/builds/Darwin/i386/docker-$VERSION"
echo "Linux 64bit tgz: $(s3_url)/builds/Linux/x86_64/docker-$VERSION.tgz" echo "Linux 64bit tgz: $(s3_url)/builds/Linux/x86_64/docker-$VERSION.tgz"
echo "Windows 64bit client binary: $(s3_url)/builds/Windows/x86_64/docker-$VERSION.exe" echo "Windows 64bit client binary: $(s3_url)/builds/Windows/x86_64/docker-$VERSION.exe"
echo "Windows 32bit client binary: $(s3_url)/builds/Windows/i386/docker-$VERSION.exe" echo "Windows 32bit client binary: $(s3_url)/builds/Windows/i386/docker-$VERSION.exe"

3
project/RELEASE-CHECKLIST.md
View file

@ -255,8 +255,9 @@ way to get some useful links for sharing:
echo "Ubuntu/Debian: curl -sSL https://test.docker.com/ | sh" echo "Ubuntu/Debian: curl -sSL https://test.docker.com/ | sh"
echo "Linux 64bit binary: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}" echo "Linux 64bit binary: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}"
echo "Darwin/OSX 64bit client binary: https://test.docker.com/builds/Darwin/x86_64/docker-${VERSION#v}" echo "Darwin/OSX 64bit client binary: https://test.docker.com/builds/Darwin/x86_64/docker-${VERSION#v}"
echo "Darwin/OSX 32bit client binary: https://test.docker.com/builds/Darwin/i386/docker-${VERSION#v}"
echo "Linux 64bit tgz: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}.tgz" echo "Linux 64bit tgz: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}.tgz"
echo "Windows 64bit client binary: https://test.docker.com/builds/Windows/x86_64/docker-${VERSION#v}.exe"
echo "Windows 32bit client binary: https://test.docker.com/builds/Windows/i386/docker-${VERSION#v}.exe"
``` ```
We recommend announcing the release candidate on: We recommend announcing the release candidate on: