Commit Graph

5732 Commits

Author SHA1 Message Date
Phil Estes
993fb310f6
Merge pull request #3160 from sofat1989/imageresume
delete the ingest when any errors happen during resuming status
2019-04-09 00:34:28 -04:00
Akihiro Suda
4d313c00ab
Merge pull request #3186 from thaJeztah/bump_dependencies
Bump dependencies
2019-04-06 13:28:24 +09:00
fesu
7045801fd4 delete the ingest when any errors happen during resuming status
Signed-off-by: Su Fei  <fesu@ebay.com>
2019-04-06 11:21:18 +08:00
Derek McGowan
dcf6023c4c
Extend release timeline
Update releases active releases with latest version and timeline.
Extend 1.1 an additional 3 months to align with k8s 1.11 EOL and 3 months extended for security.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-04-05 12:27:01 -07:00
Phil Estes
d77a5bf72d
Merge pull request #3188 from masters-of-cats/clean-test
Introduce 'clean-test' target in Makefile
2019-04-05 14:24:07 -04:00
Georgi Sabev
d5b770aa87 Introduce 'clean-test' target in Makefile
When tests fail they could leave debris behind such as
- overlay mounts
- cgroups
- metadata
These debris can cause subsequent tests to fail

Co-authored-by: Danail Branekov <danailster@gmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
2019-04-05 17:17:03 +03:00
Sebastiaan van Stijn
2583d9e426
update gogo/googleapis v1.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:19 +02:00
Sebastiaan van Stijn
a98df70da1
update containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:16 +02:00
Sebastiaan van Stijn
aa8dccd220
update containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:13 +02:00
Sebastiaan van Stijn
ed61d7f680
bump containerd/zfs and dependencies
temporarily adds both pborman/uuid and google/uuid,
pending mistifyio/go-zfs#72

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:10 +02:00
Sebastiaan van Stijn
d667628ca9
bump github.com/pkg/errors v0.8.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:08 +02:00
Sebastiaan van Stijn
68ef178352
bump github.com/BurntSushi/toml v0.3.1
switch the licenses of cmd/ to be the same as the root

full diff: a368813c5e...3012a1dbe2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:05 +02:00
Sebastiaan van Stijn
1978c0b74b
bump gotest.tools v2.3.0, google/go-cmp v0.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 14:55:02 +02:00
Michael Crosby
591e52c504
Merge pull request #3185 from thaJeztah/update_dev_dockerfile
Update contrib/Dockerfile.test
2019-04-05 08:39:46 -04:00
Sebastiaan van Stijn
2741dbe2c1
contrib: Dockerfile: bump go 1.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:59:20 +02:00
Sebastiaan van Stijn
a84f87d84f
contrib: Dockerfile: add a base stage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:26:55 +02:00
Sebastiaan van Stijn
a07e12cded
contrib: Dockerfile: reformat, and use --no-install-recommends
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:24:41 +02:00
Sebastiaan van Stijn
ba9e1ea23c
contrib: Dockerfile: use build-arg for go-version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:16:36 +02:00
Phil Estes
eea500d122
Merge pull request #3179 from Random-Liu/publish-error
Return event publish errors
2019-04-04 20:35:34 -04:00
Phil Estes
6e170ec5b7
Merge pull request #3176 from Random-Liu/update-cri-master
Update cri to 6d353571e6.
2019-04-04 20:34:34 -04:00
Derek McGowan
9990eed314
Merge pull request #3178 from crosbymichael/exitStatus
Export ExitStatus init func
2019-04-04 16:23:15 -07:00
Derek McGowan
4754d2aeee
Update image export to support Docker format
Add manifest.json file which is used by Docker
to import images.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-04-04 15:23:06 -07:00
Derek McGowan
a7e30fae99
Merge pull request #3173 from crosbymichael/reg-errors
Update handling of registry errors
2019-04-04 15:14:04 -07:00
Lantao Liu
74eb0dc812 Return event publish errors.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-04-04 14:55:38 -07:00
Michael Crosby
10cf21dcf7 Export ExitStatus init func
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-04-04 17:46:16 -04:00
Lantao Liu
a733587496 Update cri to 6d353571e6.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-04-04 14:02:08 -07:00
Michael Crosby
de1da8be32 Update handling of registry errors
Update to #3109

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-04-04 14:51:03 -04:00
Derek McGowan
4edc7336a2
Merge pull request #3169 from crosbymichael/runcbump
Update runc to resolve selinux issues
2019-04-04 10:38:57 -07:00
Derek McGowan
8d1ae237eb
Always add compressed blobs to Docker import manifest
Ensure the manifest which gets created using the Docker
compatibility code compresses the blob before creating
the manifest. This ensures consistency with manifests
used by Docker.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-04-04 10:35:01 -07:00
Michael Crosby
9bc231532d
Merge pull request #3109 from bainsy88/issue_3076
Add code to return errors from registries
2019-04-04 13:23:37 -04:00
Michael Crosby
b7183a06be
Merge pull request #3116 from thaJeztah/bump_protobuf
Bump protobuf v1.2.0
2019-04-04 13:20:29 -04:00
Georgi Sabev
c0f0b21314 Apply PR feedback
* Rootfs dir is created during container creation not during bundle
  creation
* Add support for v2
* UnmountAll is a no-op when the path to unmount (i.e. the rootfs dir)
  does not exist or is invalid

Co-authored-by: Danail Branekov <danailster@gmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
2019-04-04 18:40:30 +03:00
Georgi Sabev
2a5e4c4be7 Skip rootfs unmount when no mounts are provided
Co-authored-by: Julia Nedialkova <julianedialkova@hotmail.com>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
2019-04-04 18:20:09 +03:00
Michael Crosby
abfc89ce02 Update CRI to master
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-04-04 10:43:40 -04:00
Michael Crosby
4730088cb5 Update runc to resolve selinux issues
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-04-04 10:36:04 -04:00
Sebastiaan van Stijn
2d11f5e6d5
Regenerate protobufs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 23:41:15 +02:00
Sebastiaan van Stijn
830b0294cc
Update protobuf v1.2.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 23:27:16 +02:00
Phil Estes
e16368d21f
Merge pull request #3171 from thaJeztah/bump_logrus
bump sirupsen/logrus v1.4.1
2019-04-03 17:20:02 -04:00
Michael Crosby
fdeb1084d3
Merge pull request #3170 from thaJeztah/unkeyed_fields
do not use unkeyed fields in composite literals
2019-04-03 16:59:14 -04:00
Sebastiaan van Stijn
7c1365b468
bump sirupsen/logrus v1.4.1
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 22:23:53 +02:00
Sebastiaan van Stijn
01310eaebc
do not use unkeyed fields in compose literals
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-03 22:20:39 +02:00
Phil Estes
c9977b59f6
Merge pull request #3166 from mxpv/refactor
Move snapshotters benchmark to a separate package
2019-04-03 08:37:03 -04:00
Maksym Pavlenko
90085a7ac5 Add empty file to prevent build from failing
Go build fails on directory with only test files
https://github.com/golang/go/issues/8279

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-04-02 17:35:19 -07:00
Stefan Berger
baf3403439 Extend Applier's Apply() method with an optional options parameter
Extend the Applier interface's Apply method with an optional
options parameter.

For the container image encryption we intend to use the options
parameter to pass image decryption parameters ('dcparameters'),
which are primarily (privatte) keys, in form of a JSON document
under the map key '_dcparameters', and pass them to the Applier's
Apply() method. This helps us to access decryption keys and start
the pipeline with the layer decryption before the layer data are
unzipped and untarred.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
2019-04-02 18:19:48 -04:00
Maksym Pavlenko
8784eb6308 Move snapshotters benchmark to a separate package
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-04-02 14:42:21 -07:00
Derek McGowan
2f60e389a0
Merge pull request #2626 from krsoninikhil/defaults3
Uses namespace labels for default options
2019-04-02 11:46:35 -07:00
Phil Estes
22bb5ebc7f
Merge pull request #3159 from thaJeztah/fix_parseinfofile_parsing
Fix parseInfoFile does not handle spaces in filenames
2019-04-02 09:40:26 -04:00
Sebastiaan van Stijn
adc4fa217b
Use pkg/errors for all errors
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-02 14:13:23 +02:00
Sebastiaan van Stijn
c22effb168
fix parseInfoFile does not handle spaces in filenames
`/proc/self/mountinfo` uses `\040` for spaces, however, `parseInfoFile()`
did not decode those spaces in paths, therefore attempting to use `\040`
as a literal part of the path.

This patch un-quotes the `root` and `mount point` fields to fix
situations where paths contain spaces.

Note that the `mount source` field is not modified, given that
this field is documented (man `PROC(5)`) as:

    filesystem-specific information or "none"

Which I interpreted as "the format in this field is undefined".

Reported-by: Daniil Yaroslavtsev <daniilyar@users.noreply.github.com>
Reported-by: Nathan Ringo <remexre@gmail.com>
Based-on-patch-by: Diego Becciolini <itizir@users.noreply.github.com>
Based-on-patch-by: Sergei Utinski <sergei-utinski@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-02 13:06:32 +02:00
Derek McGowan
bc8a1895e3
Merge pull request #3155 from crosbymichael/plugins
Add configurable plugin path
2019-04-01 15:22:51 -07:00