Commit Graph

5531 Commits

Author SHA1 Message Date
Stephen J Day
cec8578ff0
cmd/dist: add ability to edit content
This allows one to edit content in the content store with their favorite
editor. It is as simple as this:

```console
$ dist content edit sha256:58e1a1bb75db1b5a24a462dd5e2915277ea06438c3f105138f97eb53149673c4
```

The above will pop up your $EDITOR, where you can make changes to the content.
When you are done, save and the new version will be added to the content store.
The digest of the new content will be printed to stdout:

```console
sha256:247f30ac320db65f3314b63b908a3aeaac5813eade6cabc9198b5883b22807bc
```

We can then retrieve the content quite easily:

```console
$ dist content get sha256:247f30ac320db65f3314b63b908a3aeaac5813eade6cabc9198b5883b22807bc
{
   "schemaVersion": 2,
   "mediaType": "application/vnd.docker.distribution.manifest.v2+json",
   "config": {
      "mediaType": "application/vnd.docker.container.image.v1+json",
      "size": 1278,
      "digest": "sha256:4a415e3663882fbc554ee830889c68a33b3585503892cc718a4698e91ef2a526"
   },
   "annotations": {},
   "layers": [
      {
         "mediaType": "application/vnd.docker.image.rootfs.diff.tar.gzip",
         "size": 1905270,
         "digest": "sha256:627beaf3eaaff1c0bc3311d60fb933c17ad04fe377e1043d9593646d8ae3bfe1"
      }
   ]
}

```

In this case, an annotations field was added to the original manifest.

While this implementation is very simple, we can add all sorts of validation
and tooling to allow one to edit images inline. Coupled with declaring the
mediatype, we could return specific errors that can allow a user to craft
valid, working modifications to images for testing and profit.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-05-02 11:05:14 -07:00
Lei Jitang
75b889dd2e Use consistent errors package
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2017-05-02 08:26:06 -04:00
Michael Crosby
92af03f193 Merge pull request #788 from krasi-georgiev/#744-no-shim-crash-with-ctr-list
fixes #744 no-shim will crash containerd with ctr list and ctr info
2017-05-01 11:17:39 -07:00
Krasi Georgiev
0e7e89c0f1 fixes #744 no-shim will crash containerd with ctr list and ctr info
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2017-05-01 18:03:02 +03:00
Stephen Day
19edcb72b5 Merge pull request #784 from crosbymichael/report-aprl28
Add dev report for april 28th
2017-04-28 16:38:06 -05:00
Michael Crosby
317aeea0fd Merge pull request #731 from stevvooe/snapshot-usage
snapshot: add Usage method to Snapshotter
2017-04-28 14:36:34 -07:00
Michael Crosby
ffb6b4ce39 Merge pull request #779 from containerd/update-governance-add-projects
Formalize process for adding new projects
2017-04-28 14:33:11 -07:00
Michael Crosby
96bf630f30 Add dev report for april 28th
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-04-28 14:18:01 -07:00
Derek McGowan
427468c626
Update console vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-04-28 14:17:47 -07:00
Derek McGowan
9a798133cf Merge pull request #774 from AkihiroSuda/fix-err-checking
execution: properly check container.Exec return value
2017-04-28 09:57:04 -07:00
Akihiro Suda
d6f35cb0c8 execution: properly check container.Exec return value
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-04-28 07:14:17 +00:00
Chris Aniszczyk
0be389436e Improve language around adding sub projects
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2017-04-27 17:20:46 -05:00
Chris Aniszczyk
e9d8bcf77c Formalize process for adding new projects
There should be a lightweight process to add sub projects to
the containerd github organization. Closes #773

Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
2017-04-27 15:52:03 -05:00
Phil Estes
b3640fdc8c Merge pull request #771 from justincormack/appease-vndr
Appease the vndr God
2017-04-27 12:15:00 -04:00
Justin Cormack
299203ade4 Appease the vndr God
Adjust paths that were not canonical.

Add nested vendors that are required.

Now no errors with latest `vndr`.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-04-27 16:51:45 +01:00
Michael Crosby
c4556fcea9 Merge pull request #777 from estesp/travis-update
Ignore `./vendor` content in travis git-validation
2017-04-27 08:36:58 -07:00
Phil Estes
99486b22a8
Ignore ./vendor content in travis git-validation
Ignores vendor content for `make dco` use of git-validation tool.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-04-27 10:51:29 -04:00
Phil Estes
f3c5811c35 Merge pull request #765 from dmcgowan/grpc-socket-permissions
Ensure grpc socket is group writable
2017-04-27 10:00:50 -04:00
Stephen J Day
66c504d1bb
snapshot: add Usage method to Snapshotter
To allow the querying of usage for snapshots, we define a new method on
the snapshotter to query the resources in use by a single snapshot.
Conversely, it can be said that if the snapshot was deleted, the
reported amount of usage would be recovered.

There are few problems with this model in the implementation of btrfs
that need to be worked out. In btrfs, it is hard to resolve the amount
of data usage with the use of quotas but these may report valuables that
are incompatible with the model.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-26 17:13:52 -07:00
Stephen Day
12d65ceb50 Merge pull request #674 from dmcgowan/fs-hardlink-unmodified
Fix hardlinks in tars for unmodified files
2017-04-26 18:50:12 -05:00
Derek McGowan
4cb0839e41 Ensure grpc socket is group writable
Updates the filemode on the grpc socket to have group write
permission which is needed to perform GRPC. Additionally, ensure
the run directory has the specified group ownership and has group
read and enter permission.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-04-26 14:40:36 -07:00
Stephen Day
d0c7f13e39 Merge pull request #755 from miaoyq/avoid-creating-snapshots-repeatedly
Avoid creating snapshots repeatedly
2017-04-26 15:02:14 -05:00
Michael Crosby
f5adc0e019 Merge pull request #769 from vbatts/doc-correction
snapshot: the examples need context
2017-04-25 10:15:43 -07:00
Phil Estes
3fde908cbf Merge pull request #766 from miaoyq/add-an-alias-for-ctr-list
Add an alias for ctr list
2017-04-25 12:29:21 -04:00
Vincent Batts
7d018f2306
snapshot: the examples need context
the api for these functions have since added `context.Context`

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2017-04-25 12:18:03 -04:00
Yanqiang Miao
bcc4d12706 Add an alias for ctr list
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-25 11:49:56 +08:00
Stephen Day
8f524ad42c Merge pull request #733 from kunalkushwaha/dist-cli-restructure
dist cli reorganized into sub-commands
2017-04-24 13:56:13 -05:00
Stephen Day
ce72a829c7 Merge pull request #752 from stevvooe/ctr-list-quiet
cmd/ctr: add quiet mode to `ctr list`
2017-04-24 13:46:58 -05:00
Stephen J Day
0377bfda5d
cmd/ctr: add quiet mode to ctr list
This is so I can delete all the containers I keep creating.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-24 12:19:47 -05:00
Kenfe-Mickaël Laventure
7a9cfbf20e Merge pull request #743 from krasi-georgiev/ctrl-c-handle-kill-container-processes
forward ctrl+c to stop container processes before exiting
2017-04-24 10:36:56 -05:00
Phil Estes
012cc9d48c Merge pull request #760 from kevinswiber/armv7_fix
Ensure proper types for arguments to `time.Unix`.
2017-04-22 11:48:10 -05:00
Phil Estes
445da51f2f Merge pull request #762 from dklyle/master
fix relative image paths
2017-04-22 11:47:28 -05:00
Krasi Georgiev
e03485acda forward all signals to the container
Signed-off-by: Krasi Georgiev <krasi.root@gmail.com>
2017-04-22 01:46:57 +03:00
David Lyle
04f76c5505 fix relative image paths
Signed-off-by: David Lyle <david.lyle@intel.com>
2017-04-21 12:27:05 -06:00
Qiang Huang
455a185d98 Merge pull request #740 from crosbymichael/oom-event
Emit oom events
2017-04-20 17:23:24 -05:00
Qiang Huang
a9601d1df9 Merge pull request #746 from sak0/dev
Correct the usage of containerd --config
2017-04-20 16:56:46 -05:00
Kevin Swiber
b365fbecfd Ensure proper types for arguments to time.Unix.
When compiling for armv7, the type is `int32` for `Timespec.Sec` and
`Timespec.Nsec` in the syscall package. When passing these values
to `time.Unix`, the values must be converted to `int64`.

Signed-off-by: Kevin Swiber <kswiber@gmail.com>
2017-04-20 12:55:06 -07:00
Michael Crosby
714ffdb51a Merge pull request #756 from lilyfang/patch-1
Update dockercon-summit.md
2017-04-20 11:07:12 -07:00
Li Li
6ae973362a Update dockercon-summit.md 2017-04-20 01:31:00 -05:00
Phil Estes
a12b20ebc4 Merge pull request #748 from miaoyq/del-tmpdir
Delete the temporary diractory at the end of the function "ApplyLayer"
2017-04-20 00:10:35 -05:00
Yanqiang Miao
df8ece5a41 Avoid creating snapshots repeatedly
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-20 12:59:33 +08:00
Stephen Day
3d076e5c33 Merge pull request #747 from miaoyq/rm-redundant-type-conversion
Remove the redundant type conversion
2017-04-19 15:19:24 -05:00
Derek McGowan
aee5b75cd8 Merge pull request #742 from xiekeyang/tmpdir
remove temporary dir
2017-04-19 13:26:50 -05:00
Derek McGowan
0f035c712f Merge pull request #750 from stevvooe/fix-dist-apply-help
cmd/dist: correct `dist apply` help
2017-04-19 13:24:28 -05:00
Stephen J Day
6eac7c159e
cmd/dist: correct dist apply help
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-04-19 12:57:28 -05:00
Phil Estes
ae502e8c2a Merge pull request #749 from boucher/patch-1
Checkpoint/Restore proposal
2017-04-19 10:06:18 -05:00
Ross Boucher
9999e85f80 Checkpoint/Restore proposal 2017-04-19 08:57:10 -05:00
Yanqiang Miao
c5c6f36e83 Delete the temporary diractory at the end of the function
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-19 09:52:44 +08:00
Yanqiang Miao
d95e98d049 Remove the redundant type conversion
The type of ocispec.Descriptor.Digest is digest.Digest now,
so the type conversion is redundant.

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-04-18 16:55:19 +08:00
CuiHaozhi
d51976b60a Correct the usage of containerd --config
Signed-off-by: CuiHaozhi <cuihz@wise2c.com>
2017-04-17 06:44:18 -04:00