Commit graph

510 commits

Author SHA1 Message Date
Daniel Nephin
47cca88c8c Dont run man generation as part of test-unit.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:35 -04:00
Daniel Nephin
00a8a40398 Add a script to generate man pages from cobra commands.
Use the generate.sh script instead of md2man directly.
Update Dockerfile for generating man pages.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-19 12:00:21 -04: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
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
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
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
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
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
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
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
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
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
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
Anusha Ragunathan
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
Tibor Vass
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
70a03951a0
fix RPM spec for man8
installation for man-8 was added in 1514b499f0
(pull-request 23236), but had a typo in a path,
causing generation of the RPM's to fail.

This fixes the path

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-08 22:21:21 +02:00
Vincent Demeester
8e63de1f63 Merge pull request #23236 from runcom/fix-spec
Fix spec and man
2016-06-07 12:54:42 +02:00
Antonio Murdaca
1514b499f0 docker-engine.spec: install man8
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-03 15:27:24 +02:00
Brian Goff
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
Kenfe-Mickael Laventure
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
Kenfe-Mickael Laventure
afc2579d1a Fix release-deb script
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-02 08:53:33 -07:00
John Starks
fa82c0aa10 Windows: work around Go 1.6.2/Nano Server TP5 issue
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-25 11:59:28 +02:00
Arnaud Porterie
dc430944b9 Merge pull request #22262 from kencochrane/fix_release_deb
Create the correct directory structure for apt-ftparchive
2016-05-11 12:38:12 -10:00
Tibor Vass
e421668b1b Merge pull request #21708 from tianon/InRelease
Also generate "InRelease" files for newer APT clients
2016-05-11 13:21:15 -04:00
Alexander Morozov
ebc5a61593 Merge pull request #22076 from thtanaka/rpmbuild-error
DWZ problem with multiple golang binary caused OL7 RPM build to fail
2016-05-06 11:22:27 -07:00
Alexander Morozov
4531c01509 Merge pull request #22236 from kencochrane/remove_git_from_rpm
Exclude .git directories from the source RPMS and debian packages
2016-05-06 11:16:12 -07:00
Vincent Demeester
af916d316a Merge pull request #22519 from mlaventure/add-dockerd-to-rpm-packaged-files
Add dockerd to the list of files included in generated rpms
2016-05-05 13:16:06 +02:00
Kenfe-Mickael Laventure
6118952e44 Add dockerd to the list of files included in generated rpms
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-04 20:45:22 -07:00
Kenfe-Mickael Laventure
20e1b9593e Update build-deb to make correct use of DOCKER_BUILD_PKGS
An environment variable cannot directly be used as a bash array, this
patch loops through all the IFS separated value (which default to
space) instead.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-02 11:22:01 -07:00
Daniel Nephin
8983d42988 Raise a more relevant error when dockerd is not available on the platform.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-05-02 11:59:25 -04:00
John Starks
57aef3b490 Windows: Support running dockerd as a service
This adds support for Windows dockerd to run as a Windows service, managed
by the service control manager. The log is written to the Windows event
log (and can be viewed in the event viewer or in PowerShell). If there is
a Go panic, the stack is written to a file panic.log in the Docker root.

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-26 14:04:47 -07:00
John Howard
0c7eab3157 Make dockerd debuggable
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-04-26 09:35:22 -07:00
Vincent Demeester
dc7664d62e Merge pull request #22308 from tianon/dockerd-consistency
Tweak hack/make/*-{client,daemon} to be consistent
2016-04-26 15:32:06 +02:00
Ken Cochrane
f1ad6f127b Exclude .git directories from the source RPMS
Ignore .git directory when creating debian sources

Added missing DOCKER_GITCOMMIT env variable to build-deb

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-26 09:26:32 -04:00
John Howard
78895c92c2 Merge pull request #22275 from Microsoft/jstarks/no_rsrc
Windows: Add file version information
2016-04-25 20:53:19 -07:00
Tianon Gravi
626d25a7d9 Tweak hack/make/*-{client,daemon} to be consistent
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-04-25 11:40:36 -07:00
Tibor Vass
e974eadd94 Merge pull request #22303 from kencochrane/fix_integration_daemon_start
Fixing the PATH in .integration-daemon-start to find dyn docker binary
2016-04-25 14:39:45 -04:00
Ken Cochrane
5ee737c70c
Fixing the PATH in .integration-daemon-start to find dynamic docker binary
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-25 11:18:34 -04:00
Ken Cochrane
f9e03d52e9
Change name from docker-client to docker in dynbinary-client
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-25 10:44:37 -04:00
John Starks
4677f8036e Windows: Add file version information
This change adds file version information to docker.exe and dockerd.exe by
adding a Windows version resource with the windres tool.

This change adds a dependency to binutils-mingw-w64 on Linux, but removes
a dependency on rsrc. Most Windows build environments should already have
windres if they have gcc (which is necessary to build dockerd).

Signed-off-by: John Starks <jostarks@microsoft.com>
2016-04-24 10:55:51 -07:00
Tibor Vass
44ff216985 Add dockerd daemon binary to tgz and zip archives
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-04-23 18:26:05 -04:00
Daniel Nephin
c0acfccc7b Cleanup from CR.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-23 15:05:15 -04:00
Ken Cochrane
f68b61052b Create the correct directory structure for apt-ftparchive. fixes #22238
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
2016-04-22 16:28:49 -04:00
Daniel Nephin
9e7651db4d Build two binaries client and daemon.
Add a proxy to support 'docker daemon'
Fix configFile option, and remove a test that is no longer relevant.
Remove daemon build tag.
Remove DOCKER_CLIENTONLY from build scripts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Change docker-daemon to dockerd.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-22 11:26:01 -04:00
Alexander Morozov
1cd7dd8917 Merge pull request #22082 from tiborvass/revert-go-security-fix-for-windows
Workaround Windows bug discovered with Go security fix
2016-04-18 12:44:13 -07:00
Tibor Vass
cbb6c6e959
runc install path changed from /usr/local/bin to /usr/local/sbin
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 3d85e51ef4)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-04-17 01:36:53 +02:00