Commit Graph

1695 Commits

Author SHA1 Message Date
Nalin Dahyabhai 230b9ab91a Replace the build system
Replace the bundle-targeted build system with simpler Makefile targets
and fewer helper scripts.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-05-25 15:50:33 -04:00
Nalin Dahyabhai dbcaa736c4 Merge pull request #11 from nalind/vendorsys
Revendor golang.org/x/sys
2017-04-19 14:55:38 -04:00
Nalin Dahyabhai e65bca53cb Re-enable the "gccgo" build target
Use a workaround from https://github.com/golang/go/issues/15628 for
issues with newer-style vendoring in gcc-go.

Travis's trusty images have gcc-go 4.9, which implements Go 1.2, so it's
missing sync.Pool (introduced in 1.3), so we can't enable the test
there.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-06 17:57:44 -05:00
Nalin Dahyabhai 149133a73a Handle differences in Stat_t on darwin
Handle Linux and BSD using different names for the mtime part of a
Stat_t.  Add darwin/amd64 to the list of cross-build arches we try
to build during 'make cross'.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-03-06 14:05:40 -05:00
Erik Hollensbe 9a2b6c119d Resolve a number of GOPATH-related issues previously missed
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
2017-02-27 12:56:17 -08:00
Erik Hollensbe d557952f5d Remove old vendor tooling
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
2017-02-16 15:28:44 -08:00
Erik Hollensbe b921859b2a Retab shell script; use official golang package everywhere, adjust paths.
Signed-off-by: Erik Hollensbe <github@hollensbe.org>
2017-01-30 08:47:26 -08:00
Nalin Dahyabhai fe2a6c4e13 Add initial Travis configuration
Add an initial Travis configuration file, and whatever fixups
and tweaks we need to build in it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-01-18 17:06:07 -05:00
Nalin Dahyabhai bcab39c5b7 Replace build tag "autogen" with a unique one
Replace the "autogen" build tag with one named
"containersstorageautogen", to avoid tripping up anyone who vendors the
library but is using that build tag already.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-01-03 10:35:39 -05:00
Nalin Dahyabhai 7438725e26 Updated vendored dependencies
Add docs and license info for engine-api and uuid, and add net/proxy and
more of vbatts/tar-split.  Prune out things which are no longer being
pulled in by our dependencies.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-08-17 11:41:26 -04:00
Nalin Dahyabhai 569ab71064 Disable "cover" bundle for now
The coverage bundle really wants the results of integration tests, and
since we don't currently have any, disable it.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-28 15:56:40 -04:00
Nalin Dahyabhai 1528f73325 Fixup determining the unit test directories
Fixup hack/make/test-unit's ability to figure out which directories
might contain unit tests so that it works outside of a container.  Most
of the tests still need root privileges to run, and since they exercise
kernel facilities that require root privileges, that's not likely to
change.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-28 14:01:54 -04:00
Nalin Dahyabhai 052bd37abe Exclude the devmapper graphdriver to cross-compile
When cross-compiling, disable device mapper, for which we probably don't
have the libraries that we'd need.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-28 14:01:54 -04:00
Nalin Dahyabhai 1ef0334d24 Don't run test-integration-cli by default for now
For now, until we have integration tests, don't try to run them, since
the script that tries to run them fails.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-28 14:01:54 -04:00
Nalin Dahyabhai d1d0e63a45 Rework some of the build machinery
- Run tests in VMs with sufficiently-new gccgo
- Assume that all binary builds build dynamic binaries

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-28 14:01:54 -04:00
Nalin Dahyabhai 0b0e3d0d61 Re-vendor go-connections to fix experimental builds
We pruned out go-connections, but it's needed for experimental builds,
so add it back.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-19 14:32:49 -04:00
Nalin Dahyabhai d855327b5e Clean up the build machinery
Most of the build machinery was still present, but no longer
functioning.  Tear most of it down.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-18 17:35:50 -04:00
Nalin Dahyabhai 60ff079996 Rename: cow/cowman -> storage/oci-storage
Rename the library module and CLI wrapper.
Rename daemon/graphdriver to drivers.
Catch up vendoring to match modules we've pruned.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-18 17:35:50 -04:00
Nalin Dahyabhai c28495d8f2 Rename from cow/cowman to storage/oci-storage
Rename the cow module and cowman tool to storage and oci-storage,
respectively.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-18 17:35:50 -04:00
Nalin Dahyabhai ba24f4fa4c Remove more code
Based on a patch by Grant Seltzer <grantseltzer@gmail.com>

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-18 17:35:49 -04:00
Nalin Dahyabhai c41093053e Remove some code we no longer depend on
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-18 17:35:41 -04:00
Nalin Dahyabhai 67eec260b5 Convert graphtool into cowman
Rename to cowman (copy-on-write manage, or something), dropping
functions beyond managing raw layers.  Since we no longer use the
dockerd layer store, just call them layers.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-15 17:22:48 -04:00
Nalin Dahyabhai 5277011c43 Add a simple graph manipulation tool
Add a simple graph/image/layer store manipulation tool, which can
* create, mount, unmount, and remove read/write layers on the host
* list, load, and save images
* list containers

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-15 17:21:18 -04:00
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