Signed-off-by: Liz Zhang <lizzha@microsoft.com>
Use the mirror in China for Azure China environment
Signed-off-by: Liz Zhang <lizzha@microsoft.com>
Update option name to --mirror
Signed-off-by: Liz Zhang <lizzha@microsoft.com>
Update indent and change variable name
Signed-off-by: Liz Zhang <lizzha@microsoft.com>
Upstream-commit: 451979a368c0fcb7990bcce82122609a7b412428
Component: engine
Apparently, Debian stretch does not come with gpg installed by
default. This patch ensures that gpg is installed.
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 047264763adb3f61b1470b97e9fa20a4f1ddc83d
Component: engine
It makes systemd integration less intrusive, notably needed for
docker machine (cf. https://github.com/docker/machine/pull/3605).
The default storage driver would now be devicemapper, until the
deb package is updated.
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
Upstream-commit: de078211b30e13825b596ff4b2798e0fb780551a
Component: engine
fixing install script for rhel7
fixing install script for rhel7
Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>
updates to fix install script for RHEL
fixing install script for rhel7
fixing install script for rhel7
Signed-off-by: Adam Kunk <adam.kunk@tiaa-cref.org>
Upstream-commit: 485c27e18680f5eaeefe5de7f7916ba23f66c8f0
Component: engine
the previous fix changed the lsb_dist variable
too early. We only normalize to "centos"
for the repository-location, so changing
it just before that.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 73d5f0648e430a74cd05ff9fd335611ddc6dd2a1
Component: engine
Add some missing dependencies in the Dockerfile:
- apt-utils for apt-ftparchive.conf
- bsdmainutils for our use of the column command in
hack/make/generate-index-listing
We also ensure that the docker daemon is started before calling
release-deb or release-rpm, since .detect-daemon-osarch, which is sourced
in each of them, requires the daemon to be running.
This commit also gets completely rid of s3cmd and fixes references to
AWS_* environment variables (changing from AWS_ACCESS_KEY to
AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to AWS_SECRET_ACCESS_KEY) in order
to please awscli. Also AWS_DEFAULT_REGION is now important to specify,
the default has been set to the region used by get.docker.com and
test.docker.com.
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 996138bf8e6acde9a937755ef81459f7d7566fc9
Component: engine
This improves on an earlier change by adding another keyserver and using a for loop instead of duplicating the command
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: adac575dd33c48b19539c0f0660c5c3f344c7b75
Component: engine
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.
This install script is used in to change the URLs instead of sed in
release.sh.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 51dad1185a8dcf55f2e3473b79748e0e72c6590c
Component: engine
From the -f description:
(HTTP) Fail silently (no output at all) on server errors. This is mostly done
to better enable scripts etc to better deal with failed attempts. In normal
cases when an HTTP server fails to deliver a document, it returns an HTML
document stating so (which often also describes why and more). This flag will
prevent curl from outputting that and return error 22.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9cf29be0ee0b19c25471c19c224f9af150beaf1e
Component: engine
Currently, the Docker repos will trigger apt-get errors on a
multiarch-configured deb system because the repos don't contain all
architectures. For example, on a multiarch system supporting amd64 and
armhf, apt-get will look for armhf Docker packages, fail to find them,
and error out.
Fix this by qualifying the repo line with the currently active
architecture.
This fixes issue #18207.
Signed-off-by: Martin Kelly <martin@surround.io>
Upstream-commit: 3e5ac742417dc9461dd090c29ee9971ff0974adb
Component: engine
Fix installation on SUSE Linux Enterprise machine, the updated Docker RPMs have
been moved to a different location.
Update both openSUSE and SUSE Linux Enterprise scripts to allow the
installation of experimental builds.
Signed-off-by: Flavio Castelli <fcastelli@suse.com>
Upstream-commit: 400ac8a66cf3c40f162153dcecd44b4fa8e3453f
Component: engine
so that the latter can be distro specific.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 5c6446f335a9f9010cabe93104f6feced0166dd8
Component: engine
