Commit graph

1672 commits

Author SHA1 Message Date
Sebastiaan van Stijn
56fb100140 Merge pull request #24568 from dmcgowan/search-v2-auth
Allow v1 search to use v2 auth with identity token
2016-07-14 19:11:33 +02:00
Daniel Nephin
674d227445 Merge service command and args as a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-13 12:31:16 -04:00
Vincent Demeester
ee981bcc73 Merge pull request #24573 from aboch/chkf
Vendoring libnetwork 905d374 and other fix
2016-07-13 16:15:59 +02:00
Alessandro Boch
cabc5b27c0 Vendoring libnetwork 905d374
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-07-12 21:51:11 -07:00
Tibor Vass
9a690d3544 docker-proxy: Force external linking to add BuildID information to please rpm
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-12 19:59:48 -07:00
Derek McGowan
1e0b7538fa Vendor distribution changes
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-07-12 17:36:57 -07:00
Christy Perez
dab287819a Uncomment the TasksMax val later in the deb build
The original sed placement was creating packages with an
"unsupported" tag in the package name.

Fixes #24197

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-07-12 16:30:31 -05:00
Madhu Venugopal
92c40f9bc0 Vendoring libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-07-12 11:27:32 -07:00
Sebastiaan van Stijn
602f1c02d9 Merge pull request #24459 from tonistiigi/update-swarmkit
Update swarmkit to 6478bc19cf
2016-07-08 23:40:27 -07:00
Brian Goff
3ab080a4bd Merge pull request #24425 from cpuguy83/add_make_run
Add target for `make run`
2016-07-08 21:10:19 -04:00
Tonis Tiigi
4d12e64cd4 vendor: update swarmkit to 6478bc19
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-07-08 13:33:15 -07:00
Brian Goff
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
Justin Cormack
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
Tibor Vass
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
Justin Cormack
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
Justin Cormack
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
Justin Cormack
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
Vincent Demeester
6ec4a640de
Vendor engine-api 1d247454d4307fb1ddf10d09fd2996394b085904
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-07 11:32:09 +02:00
Brian Goff
db271b8833 re-vendor swarmkit
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Brian Goff
140ec59db6 re-vendor engine-api
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-07-06 21:14:14 -04:00
Antonio Murdaca
8aa37bdbb7 vendor docker/distribution 4e17ab5d319ac5b70b2769442947567a83386fbc
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-07-06 13:12:37 +02:00
Otto Kekäläinen
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
Antonio Murdaca
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
Tibor Vass
93731a6350 Merge pull request #24230 from mlaventure/vendor-containerd
Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
2016-07-01 13:26:28 -07:00
Kenfe-Mickael Laventure
2685c82c2e Vendor containerd 1b3a81545ca79456086dc2aa424357be98b962ee
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-07-01 11:46:48 -07:00
Tonis Tiigi
54255f53d8 Vendor updated swarmkit, libnetwork, engine-api
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-06-30 17:21:39 -07:00
Tõnis Tiigi
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
Sebastiaan van Stijn
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
Alexander Morozov
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
Nishant Totla
af5df117a8
Updating header name and executor
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-06-29 13:26:19 -07:00
Adam Kunk
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
Stefan Scherer
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
Kenfe-Mickael Laventure
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
Sebastiaan van Stijn
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
Vincent Demeester
ee658a5aa5 Merge pull request #24002 from crosbymichael/update-containerd-jun27
Update containerd to b93a33be39bc4ef0fb00bfcb79147
2016-06-27 22:35:38 +02:00
Tibor Vass
b01c46e1d8 Merge pull request #23867 from thaJeztah/fix-install-script
Fix installation script for RHEL
2016-06-27 12:27:56 -07:00
Michael Crosby
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
John Starks
e602225160 Revendor github.com/Microsoft/hcsshim
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-06-24 16:12:43 -07:00
Tibor Vass
bf08aae852 Merge pull request #23919 from Microsoft/jjh/prefix
Windows: Ensure frozen cope with prefix
2016-06-23 19:46:55 -07:00
Tibor Vass
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
John Howard
b820ead426 Windows: Ensure frozen cope with prefix
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-06-23 16:39:16 -07:00
Vincent Demeester
18398b2933 Merge pull request #23859 from aboch/vnd
Update check-config.sh, netlink and libnetwork vendoring
2016-06-23 20:34:02 +02:00
Sebastiaan van Stijn
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
Alexander Morozov
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
Alessandro Boch
e26c513fa8 Vendoring libnetwork ed311d0
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:40:20 -07:00
Alessandro Boch
58b8b8fa15 Vendoring vishvananda/netlink 734d02c
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-06-22 09:37:17 -07:00
Kenfe-Mickael Laventure
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
Ken Cochrane
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
Darren Stahl
ee59c53c2f Revender hcsshim to v0.3.5
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-20 16:56:13 -07:00
Jana Radhakrishnan
663159e9ac Vendoring @ab62dd6bf06bf0
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2016-06-18 19:19:13 -07:00