Commit graph

1214 commits

Author SHA1 Message Date
Derek McGowan
e2b042e7c1 Merge pull request #675 from stevvooe/images-service
api/services/images: define images metadata service
2017-04-04 16:10:54 -07:00
Phil Estes
21febdb0de Merge pull request #688 from vbatts/default-config
containerd: add access to default config
2017-04-04 17:46:44 -04:00
93417d446c
containerd: missing config creates a default
This fixes silently ignore the config file not existing as well.

```bash
sudo ./bin/containerd --config farts
$ sudo ./bin/containerd --config farts
INFO[0000] config "farts" does not exist. Creating it.   module=containerd
INFO[0000] starting containerd boot...                   module=containerd
INFO[0000] starting debug API...                         debug="/run/containerd/debug.sock" module=containerd
INFO[0000] loading monitor plugin "cgroups"...           module=containerd
INFO[0000] loading runtime plugin "linux"...             module=containerd
INFO[0000] loading snapshot plugin "snapshot-overlay"...  module=containerd
INFO[0000] loading grpc service plugin "content-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "metrics-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "runtime-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "healthcheck-grpc"...  module=containerd
INFO[0000] loading grpc service plugin "rootfs-grpc"...  module=containerd
INFO[0000] starting GRPC API server...                   module=containerd
INFO[0000] containerd successfully booted in 0.001465s   module=containerd
^C$ cat farts
state = "/run/containerd"
root = "/var/lib/containerd"
snapshotter = "overlay"
subreaper = false

[grpc]
  socket = "/run/containerd/containerd.sock"
  uid = 0
  gid = 0

[debug]
  socket = "/run/containerd/debug.sock"
  level = "info"

[metrics]
  address = ""
```

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-04-04 17:32:05 -04:00
Michael Crosby
4175ebe61a Merge pull request #684 from jhowardmsft/jjh/windowsmount
Windows: dummy mount
2017-04-04 14:30:31 -07:00
28d012ea00
containerd: add access to default config
when wanting to craft a custom config, but based on the default config,
add a route to output the containerd config to a tempfile.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-04-04 16:32:12 -04:00
Stephen J Day
8c74da3983
cmd/dist, cmd/ctr: move image store access to GRPC
With this changeset, image store access is now moved to completely
accessible over GRPC. No clients manipulate the image store database
directly and the GRPC client is fully featured. The metadata database is
now managed by the daemon and access coordinated via services.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-04 10:35:55 -07:00
Stephen J Day
1ea809dc2a
images, services/images: implement image service
Server and Client images of the image store are now provided. We have
created an image metadata interface and converted the bolt functions to
implement that interface over an transaction. A remote client
implementation is provided that implements the same interface.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-04 10:35:44 -07:00
Stephen J Day
a5c9d6d41b
api/services/images: define images metadata service
This is a first pass at the metadata required for supporting an image
store. We use a shallow approach to the problem, allowing this
component to centralize the naming. Resources for this image can then be
"snowballed" in for actual implementations. This is better understood
through example.

Let's take pull. One could register the name "docker.io/stevvooe/foo" as
pointing at a particular digest. When instructed to pull or fetch, the
system will notice that no components of that image are present locally.
It can then recursively resolve the resources for that image and fetch
them into the content store. Next time the instruction is issued, the
content will be present so no action will be taken.

Another example is preparing the rootfs. The requirements for a rootfs
can be resolved from a name. These "diff ids" will then be compared with
what is available in the snapshot manager. Any parts of the rootfs, such
as a layer, that isn't available in the snapshotter can be unpacked.
Once this process is satisified, the image will be runnable as a
container.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-04 10:35:11 -07:00
Derek McGowan
8affca40bb Merge pull request #685 from crosbymichael/coc
Add code of conduct
2017-04-04 09:49:47 -07:00
Michael Crosby
5b4bffb5b0 Add code of conduct
Closes #683

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-04 09:41:38 -07:00
John Howard
67210e722c Windows: dummy mount
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-04-03 16:52:10 -07:00
Derek McGowan
e119f1dc03 Merge pull request #682 from crosbymichael/rewrite-imports
Rewrite imports for new github org
2017-04-03 15:35:45 -07:00
Michael Crosby
75705d26d1 Add DCO check to travis
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-03 15:28:07 -07:00
Michael Crosby
4f2b443a27 Rewrite imports for new github org
This rewrites the Go imports after switching to the new github org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-03 14:05:44 -07:00
Michael Crosby
0521958ac0 Merge pull request #677 from lizrice/patch-1
Propose discussion of Authorization plugin
2017-04-03 11:44:34 -07:00
Michael Crosby
c6f2193c28 Merge branch 'master' into patch-1 2017-04-03 11:42:50 -07:00
Phil Estes
3a50dd02bf Merge pull request #679 from Random-Liu/propose-image-filesystem-topic
Propose discussion of image filesystem metrics.
2017-04-03 12:45:10 -04:00
Phil Estes
efb16dad44 Merge pull request #661 from crosbymichael/stdin-closer
Open stdin write side in shim
2017-04-03 12:25:43 -04:00
Random-Liu
803a60eaac Propose discussion of image filesystem metrics.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-03-31 17:08:08 -07:00
Kenfe-Mickaël Laventure
2cf8e5ac9d Merge pull request #676 from stevvooe/delete-image
cmd/dist, images: allow image delete
2017-03-31 14:28:37 -07:00
Stephen Day
45cdc51a09 Merge pull request #673 from AkihiroSuda/run-revive-cmd
ctr/run: revive specifying custom command
2017-03-31 14:14:39 -07:00
Stephen J Day
cc983be17a
cmd/dist, images: allow image delete
This adds very simple deletion of images by name. We still need to
consider the approach to handling image name, so this may change. For
the time being, it allows one to delete an image entry in the metadata
database.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-03-31 12:49:44 -07:00
Liz Rice
f0d1c19a0f Propose discussion of Authorization plugin
Signed-off-by: Liz Rice <liz@lizrice.com>
2017-03-31 17:08:16 +01:00
Akihiro Suda
71870d7631 ctr/run: revive specifying custom command
e.g.

    $ ctr run --id foo docker.io/library/busybox:latest ls

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-03-31 02:21:33 +00:00
Stephen Day
1a983cf749 Merge pull request #672 from unclejack/small_cleanup_changes
clean up the code in a few places
2017-03-30 17:04:46 -07:00
Derek McGowan
b488d4d7e2 Merge pull request #670 from miaoyq/fix-ingest-path-err
Fix a ingest path error
2017-03-30 16:27:16 +02:00
unclejack
7b4d238ee3 archive,cmd,images: clean up some code
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-03-30 11:41:22 +03:00
unclejack
e91d6805af archive,cmd,fs: return err directly
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-03-30 11:32:13 +03:00
Yanqiang Miao
7b188f27f4 Fix a ingest path error
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-03-30 15:45:26 +08:00
Derek McGowan
d43628c930 Merge pull request #666 from unclejack/remove_duplicate_reaper
utils: remove utils & move code to sys
2017-03-30 08:40:35 +02:00
unclejack
d2a6630658 utils: remove utils & migrate code to sys
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-03-29 21:25:02 +03:00
Daniel, Dao Quang Minh
46154a6764 Merge pull request #665 from crosbymichael/logo
Add logo/assets
2017-03-29 08:39:31 +01:00
Michael Crosby
58b0baf585 Add logo/assets
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-03-28 09:33:33 -07:00
Michael Crosby
8353da59c6 Merge pull request #662 from dmcgowan/dev-report-3-24
Add development report for Mar 24 2017
2017-03-24 16:36:04 -07:00
Derek McGowan
e489b11be0 Add development report for week of March 24th
Notes about metrics, distribution and snapshot changes

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2017-03-24 16:28:03 -07:00
Michael Crosby
b1fcb1745f Open stdin write side in shim
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-03-24 15:41:12 -07:00
Derek McGowan
379bd95a3c Merge pull request #660 from crosbymichael/image-config
ctr: generate spec based on image config
2017-03-24 13:08:42 -07:00
Michael Crosby
71e8d765df set +x on overlay fs dirs
We need to set +x on the overlay dirs or after dropping from root to a
non-root user an eperm will happen on exec or other file access

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-03-24 12:55:35 -07:00
Michael Crosby
a5cc81193b Merge pull request #659 from vbatts/ctr_ascii
ctr: spaces not tabs
2017-03-24 10:37:15 -07:00
Michael Crosby
e4ad6fd23a Merge pull request #658 from krasi-georgiev/README.md-link-development-reports
adding a link to the development reports in the main README.md
2017-03-24 10:24:14 -07:00
bb2e665c68
ctr: spaces not tabs
the prior use of tabs left the top of point

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-03-24 13:23:56 -04:00
Krasi Georgiev
c1f85b262b adding a link to the development reports in the main README.md
Signed-off-by: Krasi Georgiev krasi@vip-consult.solutions

the development reports are so useful so it would be great to put a  link in the main README.md

Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
2017-03-24 02:05:26 +02:00
Michael Crosby
597815af7e Generate spec based on image config
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-03-23 15:40:09 -07:00
Stephen Day
44d2ef4db3 Merge pull request #635 from dmcgowan/snapshot-metastore-context
Snapshot driver metastore
2017-03-22 15:29:52 -07:00
Michael Crosby
355e3ec032 Merge pull request #653 from samuelkarp/scope
readme: Add metrics to scope as per #646
2017-03-22 15:16:42 -07:00
Samuel Karp
473cb40a2f readme: Add metrics to scope as per #646
https://github.com/docker/containerd/pull/646

Signed-off-by: Samuel Karp <skarp@amazon.com>
2017-03-22 15:07:40 -07:00
Derek McGowan
b24cf459d0 Merge pull request #648 from stevvooe/docker-resolver
cmd/dist, remotes: break out docker resolver
2017-03-22 14:46:45 -07:00
Stephen J Day
e1a361bff2
cmd/dist, remotes: break out docker resolver
Allow usage of the experimental docker resolver as a package. There are
very few changes to the consuming code, demonstrating the effectiveness
of the abstraction. This move will allow future contributions to a more
featured resolver implementation.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-03-22 14:14:01 -07:00
Stephen Day
4cc7cddf4b Merge pull request #649 from stevvooe/real-image-size
cmd/dist: show real image size in list
2017-03-22 14:06:25 -07:00
Stephen J Day
1f21fb7f8b
cmd/dist: show real image size in list
As a demonstration of the power of the visitor implementation, we now
report the image size in the `dist images` command. This is the size of
the packed resources as would be pushed into a remote. A similar method
could be added to calculate the unpacked size.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-03-22 13:53:58 -07:00