4d12e64cd4
vendor: update swarmkit to 6478bc19
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:15 -07:00
cae890bc79
Add target for `make run`
...
`make run` allows you to fire up a daemon (in a container) just using
the existing built binaries. This allows for more rapid iteration
instead of dealing with firing up a shell just to start the daemon.
By default the daemon will listen on port 2375 on the default network
interface.
If a port forward is required to access the daemon, the user can set
`make DOCKER_PORT=2375 run` to get a port forward on a random port with
the daemon listening on port 2375, or `make DOCKER_PORT=2375:2375 run`
to get a daemon running with port 2375 forwarded to the daemon running
on 2375.
Note that the daemon is automatically configured to listen on whatever
port is set for the container side of the `DOCKER_PORT` port spec.
When running on docker4mac, the user must do the following:
```
$ make BINDDIR=. DOCKER_PORT=2375 run
```
This makes sure the binaries are loaded in the container and a port is
forwarded, since it is currently impossible to route traffic from the
mac directly to a container IP.
To get a fresh binary:
```
$ make BINDDIR=. DOCKER_PORT=2375 binary run
```
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-08 16:25:21 -04:00
47ace5cd98
Add missing docker-proxy into managed files in rpm spec
...
This was missed in #23312 even though the other parts of
this were fixed.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-08 14:15:57 +01:00
07dd69df8d
Merge pull request #23312 from justincormack/proxy
...
Make the docker proxy a standalone binary not a re-exec
2016-07-07 17:14:40 -07:00
d428a7a425
Update swarmkit vendoring
...
Needed for libnetwork vendoring
Update Secret API name change correspondingly
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 21:01:54 +01:00
3ae0c66450
Update libnetwork vendoring
...
Update now that the changes in https://github.com/docker/libnetwork/pull/1230
have been merged
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 21:01:41 +01:00
0682468431
Make the docker proxy a standalone binary not a re-exec
...
This reduces memory usage with a lot of docker proxy processes.
On Docker for Mac we are currently carrying a patch to replace
the binary as we modify it to forward ports to the Mac rather
than the Linux VM, this allows us to simply replace this binary
in our packaging with one that has a compatible interface. This
patch does not provide an easy way to substitute a binary as
the interface is complex and there are few use cases, but where
needed this can be done.
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-07 12:53:39 +01:00
6ec4a640de
Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:09 +02:00
db271b8833
re-vendor swarmkit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
140ec59db6
re-vendor engine-api
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
8aa37bdbb7
vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-06 13:12:37 +02:00
644a7426cc
Fix spelling in comments, strings and documentation
...
Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
2016-07-03 20:58:11 +03:00
0c07e55e4c
fix F24 rpm build
...
error: line 89: Invalid version (epoch must be unsigned integer):
%{epoch}:1.12.0-0.3.rc3.fc24: Requires(pre): docker-engine-selinux >=
%%{epoch}:1.12.0-0.3.rc3.fc24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-01 23:29:48 +02:00
93731a6350
Merge pull request #24230 from mlaventure/vendor-containerd
...
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
2016-07-01 13:26:28 -07:00
2685c82c2e
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-01 11:46:48 -07:00
54255f53d8
Vendor updated swarmkit, libnetwork, engine-api
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:21:39 -07:00
8fe6480c8a
Merge pull request #23584 from nishanttotla/private-images-swarm-services
...
Passing registry auth token for service create, update
2016-06-30 17:18:59 -07:00
295a6a37dc
Merge pull request #24100 from hypriot/revert-tasksmax-workaround-21628
...
Revert tasksmax workaround to avoid unsupported bins
2016-06-30 13:20:33 -07:00
3926d98394
Merge pull request #23631 from mlaventure/unstuck-ci-hangs-with-warning
...
Prevent CI from getting stuck if shims are left alive
2016-06-30 11:41:41 -07:00
af5df117a8
Updating header name and executor
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
485c27e186
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>
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>
2016-06-29 13:51:27 -04:00
6509cc4e63
Revert tasksmax workaround to avoid unsupported bins
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-06-29 08:10:10 +02:00
fd1129d31a
Prevent CI from getting stuck if shims are left alive
...
This will kill any left over containerd-shims to avoid the integration
script to stay stuck while it waits on them.
It will then causes CI to fail (even if all the tests succeeded).
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-28 10:05:05 -07:00
1c06ebeeee
Merge pull request #23950 from jstarks/no_clone_tp5
...
Windows: Disable VM cloning for TP5 image
2016-06-27 15:13:50 -07:00
ee658a5aa5
Merge pull request #24002 from crosbymichael/update-containerd-jun27
...
Update containerd to b93a33be39bc4ef0fb00bfcb79147
2016-06-27 22:35:38 +02:00
b01c46e1d8
Merge pull request #23867 from thaJeztah/fix-install-script
...
Fix installation script for RHEL
2016-06-27 12:27:56 -07:00
7db7e04631
Update containerd to b93a33be39bc4ef0fb00bfcb79147
...
This updates containerd to b93a33be39bc4ef0fb00bfcb79147a28c33d9d43
fixing the start sync issues.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-27 11:45:05 -07:00
e602225160
Revendor github.com/Microsoft/hcsshim
...
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 16:12:43 -07:00
bf08aae852
Merge pull request #23919 from Microsoft/jjh/prefix
...
Windows: Ensure frozen cope with prefix
2016-06-23 19:46:55 -07:00
45f76db06d
Merge pull request #23824 from mlaventure/fix-apt-repo-components-fields
...
Fix the value of the Components value in apt {In,}Release files
2016-06-23 17:54:13 -07:00
b820ead426
Windows: Ensure frozen cope with prefix
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-23 16:39:16 -07:00
18398b2933
Merge pull request #23859 from aboch/vnd
...
Update check-config.sh, netlink and libnetwork vendoring
2016-06-23 20:34:02 +02:00
73d5f0648e
Fix installation script for RHEL
...
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>
2016-06-23 11:17:55 -07:00
138f9538f3
Merge pull request #23776 from Microsoft/ShutdownError
...
Windows: Prevent logging errors when shutting down an already shut down container
2016-06-22 12:11:00 -07:00
e26c513fa8
Vendoring libnetwork ed311d0
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:40:20 -07:00
58b8b8fa15
Vendoring vishvananda/netlink 734d02c
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:37:17 -07:00
63b0713014
Fix the value of the Components value in apt {In,}Release files
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-21 12:01:41 -07:00
0e84474672
Fixed issue #23787 install script not working for RHEL7 host
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-06-21 09:40:00 -04:00
ee59c53c2f
Revender hcsshim to v0.3.5
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-20 16:56:13 -07:00
663159e9ac
Vendoring @ab62dd6bf06bf0
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-18 19:19:13 -07:00
64a567d24c
Vendoring swarmkit @3f135f206179e
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 19:01:18 -07:00
70e2585d54
Vendoring libnetwork @13be89d1cf79
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-17 10:27:34 -07:00
0ef720eded
Merge pull request #23643 from tonistiigi/membership
...
Return membership status on join without timeout
2016-06-17 01:40:06 +00:00
7ef9aec90f
Merge pull request #23570 from vdemeester/change-plugin-install
...
Update docker plugin install code…
2016-06-17 00:12:56 +00:00
eb6cc31802
Merge pull request #23639 from mavenugo/ln-rc2
...
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
2016-06-16 16:17:07 -07:00
58529a1553
Bump engine-api to c57d0447ea1ae71f6dad83c8d8a1215a89869a0c
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-17 00:32:58 +02:00
2783568284
Update swarmkit to 310f1119
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-16 15:06:27 -07:00
7f2f6ed0d6
Vendoring Libnetwork caf22bd9a6a53dfe91b0266274155bc69235e8ed
...
* fixes https://github.com/docker/docker/issues/23622
* fixes a memory leak issue with bulk sync
* fixes external DNS resolution issue after live restore
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-16 14:33:36 -07:00
6577031787
Merge pull request #23606 from vieux/fix_secrets
...
fix docker swarm init/update --secret
2016-06-16 14:24:35 -07:00
e233c8dd72
Update release script installation instructions
...
Instructions for installing the static binaries
has changed, so updated the instructions.
The comment on top already requires the steps
to be executed as root, so removing the 'sudo'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-16 11:58:29 -07:00
9cdb6357e2
Merge pull request #23603 from mlaventure/revert-runc-to-mainstream
...
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
2016-06-16 05:08:44 +00:00
085895342c
fix docker swarm init/update --secret
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-06-15 17:05:10 -07:00
b675124cf5
Vendor in runc cc29e3dded8e27ba8f65738f40d251c885030a28
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-15 15:11:50 -07:00
e927df7b4b
Update libnetwork to 96d45528599c32354230480a1ebc0
...
This fixes an issue with hanging tests due to store.
Fixes #23560
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-15 15:07:04 -07:00
011774e6f0
Merge pull request #23542 from mavenugo/aliases
...
Use service alias and configure service VIP or dns-rr
2016-06-15 16:18:50 -04:00
64eb01caf6
Merge pull request #23538 from anusha-ragunathan/incremental-builds
...
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
2016-06-15 10:53:31 -07:00
5af8e2a9c0
Vendoring swarmkit 682e0b69be208176d6055cba855a5e9cf15c7cb4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-14 19:50:34 -07:00
f2f97f768e
Vendoring libnetwork 0d517a9e4e5cbdb889b3257eebd2351addcd46d4
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-14 19:50:34 -07:00
91197953d0
Merge pull request #23524 from aboch/restore
...
Daemon to support network restore
2016-06-15 02:33:16 +00:00
574f7d2149
Merge pull request #23551 from tonistiigi/update-swarmkit
...
Update swarmkit to 25572005f
2016-06-15 02:25:31 +00:00
cdf279d74d
Update swarmkit to 25572005f
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-14 17:07:14 -07:00
e5b7d36e99
plugins: vendor engine-api to import new plugin types
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-06-14 14:20:27 -07:00
5b79122146
Vendoring libnetwork 452dff1
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-14 13:45:24 -07:00
379ec38222
Dont leak DOCKER_INCREMENTAL_BINARY flag into go test.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-06-14 13:02:54 -07:00
2e9ea5c194
Update containerd and runc vendoring
...
containerd: 860f3a94940894ac0a106eff4bd1616a67407ee2
runc: 85873d917e86676e44ccb80719fcb47a794676a1
runtime-specs: v1.0.0-rc1
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-14 07:47:31 -07:00
a1e319e847
Merge pull request #23361 from docker/swarm
...
Add dependency to docker/swarmkit
2016-06-14 00:55:55 -07:00
4940985340
Merge pull request #23224 from mlaventure/dont-overwrite-existing-deb
...
Do not overwrite already published deb files when releasing
2016-06-13 22:16:53 -07:00
44793049ce
Add dependency to docker/swarmkit
...
Add a dependency to `docker/swarmkit` in preparation for adding
first-class Swarm-wide service management inside the Docker Engine as
described in our ROADMAP.md.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-06-13 22:16:18 -07:00
f7600fc641
Merge pull request #23261 from dimrozakis/23260
...
Escape brackets in hack/install.sh
2016-06-13 20:19:26 +02:00
d4d8cc9c0a
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-10 15:27:05 -07:00
a4ff707e99
Merge pull request #23406 from thaJeztah/update-deb-script
...
release-deb: create "dists" directory if missing
2016-06-10 00:05:43 +02:00
30bbf184e9
Merge pull request #23392 from Microsoft/RevendorHcsshim
...
Revendor hcsshim to v0.3.2
2016-06-09 11:39:39 -07:00
94ac03cdf5
release-deb: create "dists" directory if missing
...
The script failed if an empty volume is used
to generate the repo. This adds the directory
if missing.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-09 15:22:49 +02:00
758f9a8ceb
Bump seccomp version to enable ppc/s390x seccomp support
...
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-06-09 05:48:06 -04:00
456551a672
Merge pull request #23380 from Microsoft/jjh/refreshwin2lin
...
Update win2lin scripts to match production
2016-06-09 08:14:14 +02:00
bb1c54bc1f
Revendor hcsshim to v0.3.2
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-08 17:32:22 -07:00
6717b35503
Merge pull request #23385 from thaJeztah/fix-rpm-manpages
...
fix RPM spec for man8
2016-06-09 01:04:02 +02:00
6fd8c96f61
Merge pull request #23344 from pdalpra/timeout-as-time.Duration
...
Timeout as time.duration
2016-06-08 16:37:08 -04:00
70a03951a0
fix RPM spec for man8
...
installation for man-8 was added in 1514b499f0
2016-06-08 22:21:21 +02:00
9ea3f2aca2
Update win2lin scripts to match production
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-08 11:08:23 -07:00
d17b9f3da0
Update containerd to cf554d59dd96e459544748290eb91
...
This bumps containerd to cf554d59dd96e459544748290eb9167f4bcde509 and
includes various fixes and updates the grpc package and types generated
for use.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-07 15:27:23 -07:00
66234eaf9b
Bump engine-api to 8c2141e14bb9e7540938d155976b3ef0661e4814
...
Signed-off-by: Pierre Dal-Pra <dalpra.pierre@gmail.com>
2016-06-07 18:18:37 +02:00
f061f556f2
Merge pull request #23269 from vdemeester/migrate-import-to-cobra
...
Use spf13/cobra for docker import
2016-06-07 13:07:30 +02:00
8e63de1f63
Merge pull request #23236 from runcom/fix-spec
...
Fix spec and man
2016-06-07 12:54:42 +02:00
7d08f3a5ad
Merge pull request #22866 from jstarks/foreign_layers
...
Support layers from external URLs
2016-06-07 00:27:40 +00:00
ca01e57d55
Update cobra to 75205f23b3ea70dc7ae5e900d074e010c23c37e9
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-06-06 13:58:18 +02:00
3f970819bb
Merge pull request #23063 from yongtang/22961-aws-sdk-go
...
Update aws-sdk-go to v1.1.30
2016-06-05 16:01:52 -04:00
c088321ea8
Escape brackets in hack/install.sh
...
Fixes #23260
Signed-off-by: Dimitris Rozakis <dimrozakis@gmail.com>
2016-06-05 13:01:44 +03:00
feab8db60d
Vendor docker-credential-helpers v0.3.0
...
Fix a bug in the vendor helpers that took packages
that started with github.com/docker/docker like if
they were from within the project.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-06-04 10:06:07 -07:00
ed87071632
bump engine-api to 772250a752e34cacaeef7c92b8e0ddf43450b629
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-04 14:16:36 +02:00
e6637f8d9e
Merge pull request #23124 from kencochrane/fix_redhat_install_script
...
Fix issues with get.docker.com install script with redhat
2016-06-04 00:04:09 +02:00
1514b499f0
docker-engine.spec: install man8
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-03 15:27:24 +02:00
726ef47d5c
Merge pull request #23215 from BlackYoup/pkg-config
...
make.sh: use PKG_CONFIG environment variable if it exists
2016-06-03 15:04:37 +02:00
f1755b2560
Merge pull request #23227 from yongtang/06032016-engine-api
...
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
2016-06-03 14:15:31 +02:00
9bb54f89ad
Add `make install` task
...
This installs docker and dockerd to `$DOCKER_MAKE_INSTALL_PREFIX/bin`, which
defaults to `/usr/local/bin`
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-03 12:08:33 +02:00
10c35196b1
Vendor engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
...
This fix tries to update engine-api to 5d8739372315f8147ceb7bcc53576893ff96ffc6
This fix brings engine-api up to date, which includes changes from:
https://github.com/docker/engine-api/pull/256
https://github.com/docker/engine-api/pull/254
This fix is related to
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-03 02:27:17 -07:00
acd67e25a9
Do not overwrite already published deb files when releasing
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-02 21:01:57 -07:00
f02ffd9e19
Bump etcd to 2.3.2
...
Bump etcd to 2.3.2 and `github.com/ugorji/go` accordingly.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-06-02 18:35:45 -07:00
76d8b0dab7
Bump engine-api to fa04f66c7871183dd53a5ec666479f49b452743d
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-03 00:14:55 +02:00
eb9274844e
Merge pull request #23140 from Microsoft/HcsshimRevendor
...
Revendor hcsshim
2016-06-02 22:09:19 +02:00
Tonis Tiigi