diff options
| author | Bruce Ashfield <bruce.ashfield@xilinx.com> | 2020-10-12 08:41:31 -0700 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-10-14 20:34:04 -0400 |
| commit | d3207bbd6fc489bb203047e901d629ae4a7960cf (patch) | |
| tree | c5b6f17ba7df29adc7c9a874ab0aef89ae704818 | |
| parent | 43a5cc7f031da1ef75b1ff33def3ef4984ad72e3 (diff) | |
| download | meta-virtualization-d3207bbd6fc489bb203047e901d629ae4a7960cf.tar.gz | |
containerd: upgrade to 1.4.x
Updating containerd to the 1.4.x release series, which contains the
following changes:
97d690d20 Prepare v1.4.1 release
42f387186 Always consume shim logs
f247618a3 Report correct stats for windows containers
cc5d1518f Update go list to respect build tags
086e859d2 BUILDING.md: fix description about static builds
16712ae49 bump cni version to v0.8.0
1575c88cc seccomp: add `faccessat2` syscall.
8bd2becea seccomp: add `openat2` syscall.
4e3397e05 shimv1: downgrade poroccess missing log to debug
d118c90d3 Ignore SIGURG signals in signal forwarder
3ee6189fe Exit signal forward if process not found
a1289d6b8 tasks: Monitor v2 tasks in initFunc as well
1f823f76d seccomp: allow io-uring related system calls
3d28944be seccomp: allow clock_settime when CAP_SYS_TIME is added
e5cc7d527 seccomp: allow quotactl with CAP_SYS_ADMIN
20273a803 seccomp: allow sync_file_range2 on supported architectures.
357d10021 seccomp: allow personality with UNAME26 bit set
0c9de6629 seccomp: allow syscall membarrier
caa461167 seccomp: allow adjtimex get time operation
2b80b7dc4 seccomp: allow add preadv2 and pwritev2 syscalls
e71eccbca seccomp: move the syslog syscall to be gated by CAP_SYS_ADMIN or CAP_SYSLOG
feff914af runtime: ignore ErrNotExist when remove rootfs
23e0ea27b snapshots/devmapper: fix rollback
d68ddb0c0 Prepare v1.4.0
6be2eccd7 Update releases page for v1.4.0
d469bffcd CI: disable crun on Vagrant to decrease flakiness
77a33e3db systemd: add license header to systemd unit
8d39722fe Vagrantfile: increase memory
41469ed72 Update version for 1.4.0-rc.1
60fa35f11 Fix DCO commit limit
d2472ecc5 Add CRI release build
1c7312e5d Update containerd systemd unit file
ccda53760 Create etcd user in cloud init.
e973719cc use containerd/project header test
cb7ffd4b0 Fix indent in cni.template.
3e03ba7aa Update deployment and integration test
9c5451792 Add TaskMax=infinity
523b0b3c6 Remove `noSnat`
231d291b2 Use v2 config.
1e1688d21 Use per-pod shim.
87bd84a7b Add DefaultRuntimeName option.
cfab98a5f Use ctr images import.
5e3ac16cc Add `cri` as required plugin.
5b9d8476e Use runc.v1 for now for debugging.
e6e272e74 Enable runc.v2 as the default runtime in test.
d19aa0fd2 Use local env to avoid writing to passed-in readonly env.
ee6d69bbc Set default "" to extra runtime handler.
474c79bd5 Expose vars to configure an additional runtime handler
ce12477f4 Support docker 18.09 in the test script.
146712101 Remove the unused `health-monitor.sh`.
201ad4d3c Support netd in GCE bootstrap.
5ce705750 Serve streaming on localhost by default to match k8s 1.11 default.
b553fdaf3 Remove crictl on GCE for all cases.
d8ce08fd9 Set stream server to serve on localhost on GCE.
1629bab7f Make max container log line size configurable through cloud init.
042378dcf Disable TLS streaming to work with new kubelet streaming proxy.
37f2ecad9 Update cni.template
b58b6fef8 Disable restart plugin on GCE.
f938a166c Fix kube-container-runtime-monitor.
91f8e61bd Use crictl installed in kube-up.sh
5161f663e Add `unix://` prefix for socket addresses used by CRI remote client.
1b995fcaf Add KUBE_CONTAINER_RUNTIME_NAME to fix fluentd support.
48457a254 Try using preloaded containerd if no version is specified.
c67a38b0b Add log level support.
4453aac00 Improve gce bootstrapping in various ways.
1bd3cdc57 Add cni config template support.
d520fac50 Enable TLS streaming in all the setup.
cdb4aec93 Use systemd service cgroup and oom score adj.
af8bd8068 Fix for kube-up.sh and update several documments.
005da4a9b Replace `ctrcri` with `ctr cri`.
0e2bd216c Update GCE cluster bootstrapping and e2e test
59e65e1f3 Enable container log rotation.
85b4e69c9 Do not block on stream server close.
2ea6584ca Add initial wait for health-monitor and use pkill -x.
56b7ef2c4 The ENV is finalized as KUBE_KUBELET_EXTRA_ARGS.
24a3a0a06 change crictl sandboxes to pods; other references to sandboxes
8bc30e7a2 Update ocicni to main stream.
a01071558 Add a separate CLI for cri-containerd `ctrcri`.
a843a3064 Use registry-1.docker.io as backup
ec649079a Put version into metadata so that version won't be changed across restart.
7cbc1c8dc Set registry mirror.
9f0816ac4 Configure container runtime cgroups for cgroup.
be72f47ec Add runtime cgroup and fix a cli panic.
680e21c43 Update all glog flags to `log-level`.
d50b9dd64 Update containerd to 6c7abf7c76c1973d4fb4b0bad51691de84869a51.
869ea6b0c Add document for kube-up.sh
30cbfb62e Add OS and arch in release tarball.
0512d1e0b Add `cluster` directory and health-monitor.sh.
a1736f98a vendor: containerd/cri 4e6644c8cf7fb825f62e0007421b7d83dfeab5a1
15fa7f378 vendor: update kubernetes v1.19.0-rc.4
4a0ac319c vendor: golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
f80b4dc58 vendor: golang.org/x/net v0.0.0-20200707034311-ab3426394381
5a9a6a145 vendor: golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
aa40ebb41 vendor: json-iterator/go v1.1.10
b4376e986 Update Vagrantfile for testing SELinux
55c9eade3 Bump Golang 1.13.15
e3e2c3946 update docs/rootless.md
843360298 update runc to v1.0.0-rc92
e20a5079e Add --cpu-quota, --cpu-period flag to ctr
3cc2be2a8 Update cri-tools to v1.18.0-100-g2bf7674 for Go 1.15 compatibility
628855923 Prepare 1.4.0-rc.0 release
74e9aa7ab snapshots/devmapper: don't hardcord the platform strings
adeba792f Add namespace query parameter for registry proxying
5a190c707 Remove seccomp/Linux deps steps in GH Actions
6988b4d64 remove `seccomp` buildtag
362b7167a vendor: update cri (no more libseccomp cgo dependency)
03b5a053e remotes: mark GetTokenScopes public
b43a01a22 Change nodeset to `ubuntu-xenial-arm64-openlab`
04b98bb0e Deprecate legacy shims
b87023185 vendor runc library to v1.0.0-rc91-48-g67169a9d
02afa9425 Add --cpus flag to ctr
aa56cfc0a Import Windows manifest into test build, rather than copying by script
5b1627410 vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
1ec1e9eab Add Windows 10/Windows Server 2004 for integration tests
faa4ff56e Usefully fail tests with unknown or bad Windows Build version
3795dd41a Always report server log from verbose integration test runs
4318f93f9 Add Spec() method to task
3611efdce update cri to 8448b92d237e877bed1e4aa7a0baf0dee234
1b320bcc2 update for cni config
c2081369c Add doc about remote snapshotter
403dc83a2 mount: retry executing the helper binary on ECHILD
06fb93e0f Reject host-mode networking on Windows
ca15cb0d8 Fix incorrect (cut-and-paste) method comment
c8b14ae4c Set content labels based on content type
d7b9cb001 shim: move event context timeout to publsher
b97c660e1 cgroup2 CI: add RUNC_FLAVOR=runc
1a7bbd1f7 vendor: update containerd/cri
96099550b parseIDMapping: accept 32-bit IDs
089672fff Bump Golang 1.13.14
c383436af snapshots/devmapper: suspend a device to avoid data corruption
71f11db8a Annotate bare ErrNotImplemented returns
061d338ec CI: run CRI tests on Fedora 32
decbb0499 RELEASES.md: fix a dead link
b2ee43206 CI: add back shim v1 test
c4418bb3a CI: remove an unreferenced variable
212c29833 Updates to go-systemd and selinux
b47c7ec27 Update to later version of critools with timing fix.
7af3d7e17 Don't clash with GH Actions runner's containerd
c520f819a Bump Go 1.13.13
7119a2a15 platforms: don’t log arm variant error on darwin
fc0448518 Update version to 1.4.0-beta.2
cc493eba3 vendor: containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff
7855b0a78 Make title similar with other CI workflow jobs
852587cd1 [events/exchange_test] Fix deadlock in TestExchangeFilters
d47c0392d Updating build doc to require Go 1.13
09f453394 CI: {v1, v2} -> io.containerd.runc.{v1,v2}
d7e59b141 enable removecontainer to forcibly remove containers
963625d7b Update runc to v1.0.0-rc91
c041970e9 update crun to v0.14
a6dd1f27d update urfave/cli v1.22.1, go-md2man v2.0.0, blackfriday v2.0.1
68b736ddf cio: should not open fifo for stderr if terminal
57a9f0b50 Minor actions fixes/updates
148cc8f71 [events] Fix deadlock in TestExchangeBasic
aa191deff Change log for unknown mt to debug
45c28f56b Add ability to use remapper labels versus remapping snapshot helper
c76bf5504 Make unique snapshotter opt for label-assisted remapping
331793118 allow user namespace remapping using snapshotters
e977564a8 seccomp: allow 'rseq' syscall in default seccomp profile
e7f069e2c describe content flow and dependencies
b96f5f4b5 Fix deprecation warnings in CRI tests due to missing unix:// scheme
fd99b6566 decrease log level of cgroup2 ToggleController error when running in UserNS
2b0a994cc explicitly fail apparmor when !linux
bebfbab03 vendor: update bbolt to v1.3.5
1a83f9a63 Bump Golang 1.13.12
03ab1b2ca Add config for allowing GC to clean unpacked layers up
ee734e867 Add test case with backticks
ea0687769 vendor: golang.org/x/text v0.3.3
f1a469a03 shim v2 runc: propagate options.Root to Cleanup
8897e1520 Add more test cases with single quotes
cb91b1724 Add testcase containing mountpoint with escaped backslash
87f9fdb06 Cope with double quotes in Linux Mountinfo
4c49ff88c integration: assume TEST_RUNTIME to be io.containerd.runc.v2 by default
785f4c5cd Bump CRI for 1.4x release
730b7a932 Change the type of PdeathSignal
d656fa38c restart plugin: support binary log uri
0f831093c Update usage of whitelist in project
d36810d66 overlay: use index=off to fix EBUSY on mount
7213cd89d Process I/O: Fix goroutine leak
ae08491bf waitForPid: fix goroutine leak
8fcd5a1f2 Streamline hcs shim release flow
ef0cf1264 Match version used in CRI project
2be80f999 Add windows hcsshim to release pipeline
3e95727f3 Make killing shims more resilient
e64b14820 Revendor CRI to 62c91260d2f43b57fff408a9263a800b7a06a647
3dd8242a6 Add host specific headers
2f601013e cgroup2: implement `containerd.events.TaskOOM` event
62fd1750e Revendor CRI to 8898550e348932e406049e937d98fb7564ac4e7a
2bc4e90f6 Don't inadvertently clip release notes
636c533d9 Add ctr subcommand to print default OCI spec
230cf6ded Add unit test for func in remotes/docker/handler.go
bb2b2825b Add release GH Action triggered by signed tag
8f1ddb142 Update release for 1.4.0-beta.1
c376f4f76 Move Windows testing to GH Actions
322628347 Fix client tests to work on Windows.
b8ccdcb07 Add `ctr` flags for configuring default TLS credentials.
c5273930b Update CRI to 52c2c6b5df15790b671ebd6cbbc6039a4d30
af131d725 cgroup2 CI
e34bf08e5 riscv64 arch does not support -buildmode=pie
0c9b05fa6 Fix image usage calculation error
84619ee99 Fix configurations with no server provided
06b0cd45b Fix nil pointer errors
03755821d seccomp: remove the unused query_module(2)
5765991f2 seccomp: Whitelist `clock_adjtime`
db74d3115 unpacker: Fix data race and possible data corruption
232518252 docker: fix data race on err
d07a71b97 Bump Golang 1.13.11
0207b7ff0 Enable running CodeQL on PRs that modify Action
1a06884f1 Add CodeQL Analysis workflow
563964e9d Trigger nightly builds on pull reuqest events
77ab0104e Add release notes for 1.4 beta
6eeed18cb vendor: opencontainers/go-digest v1.0.0
7cdacdda8 Set codecov to not comment on PRs
3e7bbb8a4 vendor: update containerd/cri, remove "docker/distribution" dependency
9898dc2a6 Code about `task` in "README.md" is out of date
f09e99909 vendor: containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c
d9d1d5b62 vendor: containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf
c5078a5b7 vendor: containerd/continuity d3ef23f19fbb106bb73ffde425d07a9187e30745
b437938d2 Transfer error to ErrNotFound when kill a not exist container, also add test case.
2c77dc63a vendor: update containerd/cri to current master
a4f8be1d4 vendor: kubernetes v1.18.2
0d198fd09 vendor: roll docker/distribution back to latest (v2.7.1) release
1b9640496 ConfigureHosts: remove deprecated DualStack option
e9e765d6e Use tagged versions in vendor file
bd3210d29 remove releases/*-beta.toml
ed261720c Update ttrpc/typeurl to v1.0.1
dc92ad652 Replace errors.Cause() with errors.Is()
f212e7d1f vendor: github.com/pkg/errors v0.9.1
63b7587cd snapshots/devmapper: fix race windown causing IO hangup
24b331ad1 omit sudo when EUID eqto 0
0088c2de8 sys: RunningInUserNS(): use sync.Once
76c62f272 sys: simplify RunningInUserNS to original implementation
6a9b94927 Remove remaining uses of libcontainer/system package
37c839e59 sys/proc: remove GetSystemCPUUsage as it is unused
1b66fecad Integrate sys.SetSubreaper, sys.GetSubreaper in sys/reaper package
fffea312a move sys.Reap() into sys/reaper package
295e74008 sys: remove custom setChildSubreaper const
ec12d3042 vendor: sirupsen/logrus v1.6.0
23aab35fd Remove libcontainer from containerd-shim
ae7cdc814 vendor: update containerd/cri
c1096864a Update to latest hcsshim - 0.8.9
ea182aec8 vendor: sirupsen/logrus v1.5.0
68f151593 vendor konsorten/go-windows-terminal-sequences v1.0.3
046a520c9 vendor: update containerd/cri dc7afe8fbe53db06c3f883f6f8c9895a9dfb2314
8e76d18ef remove if condition because it is handled by the sdNotify daemon func
1a10211e3 WithLease: always return context and done fn
98b30f469 Add commands to mount/unmount image from ref
cd0e62f5c Allow more time for containerd to start for integration
9687ba631 test: TestRuntimeWithEmptyMaxEnvProcs should cleanup
b566859ac .zuul: update go version to 1.13.10
32649fe30 Fix retrieval of golangci-lint specific version
126e497e6 vendor: update ttrpc with 6e416eafd26e6e738df716b21d421d5b59702bb4
0116352e1 runtime: ignore ttrpc.ErrClosed when delete task
917e7646a Add binary IO tests
9175401b2 Cleanup binary IO resources on error
0dc7c8595 Don't use timeout package when stopping shim logger
857408315 This config no longer exists, so remove from docs.
e79d666cd vendor: update containerd/cri 61b7af7564602234662562a9d37e772f5a54facb
61597b431 Disable Travis CI on master
74ceb35f5 Small fixes to our Actions CI workflow
7a252f3ca Build runc with selinux support
041545cd6 Fix protobuild and CI check protos
e3bc5c487 Use GH Actions CI status for badge
49200a1dd CRI plugin needs selinux tag as well
d97cca47e RELEASES.md: update release1.2 status
4615111ba content/local: validate digest before calculating path
a6828e8c3 CI: Some Go 1.13.10 updates that were missed
7da1e13b5 Bump Golang 1.13.10
35c14c6b5 sys/mount_linux: use pipe for communicating mount result
f328f61b8 Update to selinux 1.5.1
f7c2bf544 Migrate functions to actions
d7c2513ff Update integration test timeout
0caa23315 Rework shim logger shutdown process
067aba732 Add test for default setup for host configuration
d9a1c3f9e bugfix: add default host config if not set
6d4429edd Setup dependencies between jobs
e598e5e0c Add CRI tests
4175ebf23 Move integration tests to Github Actions
599547d9c Make binaries with Github Actions
3968fb0a4 Revert "vendor: update go.etcd.io/bbolt v1.3.4"
056d60224 vendor: update go-events to fix alignment for 32bit systems
4fb3410f6 vendor: cilium/ebbf 4032b1d8aae306b7bb94a2a11002932caf88c644
e822296fc vendor: runtime-spec v1.0.2
3261fb5c4 vendor: containerd/cgroups b4448137398923af7f4918b8b2ad8249172ca7a6
aa76d9537 Bump Golang 1.13.9
ad090e67e man: move ctr.1, containerd-config to section 8, and fix generation
356782cb4 Makefile: man page: rename containerd.1 to containerd.8
547301cb0 Update ctr resolver to use new config package
17b6050d2 Add Docker resolver configuration package
dc131aa86 support loading certs from a directory
c263c5b14 Add unit test for func in remotes/docker/handler.go
c8d9c6f2a Add unit test for func in remotes/docker/handler.go
fb9e3d9f2 vendor: update go.etcd.io/bbolt v1.3.4
e4cbbc78b Move checks to Github actions
c1a218195 Add docs for build tags used by cri.
d654dbafa Allow the id for cgroup metrics to be changed
78ab1d13d Correct logic of FIFO cleanup
92a36dc10 Add version numbers for newly tagged repos
0c78dacbc Move isFifo from process/io to sys/ and make public
9529c69b8 seccomp: add 64-bit time_t syscalls
ebd745f91 ctr: do not assume runc options by default
e2269f2ae archive: skip chmod IsNotExist error
bd2265300 Add devmapper configuration examples
5ef66e48f ParseSignal: drop add'l check for numeric signals
649f2aac6 add -v to shim binaries
4ff9d6996 Increase golangci-lint timeout
c00cf9a67 vendor: containerd/cri 92cb4ed9786a6cd271152ba1f862183d84701003
488d6194f fix dial error when clean up a dead shim
6e638ad27 Nit: fix use of bufio.Scanner.Err
4326fc624 Update Golangci-lint v1.23.8
4756258fa service_windows.go: remove unused "service" variable
a9bd451ab Avoid duplicate imports of github.com/gogo/protobuf/types
cad67b73f Update btrfs dependencies in docs for debian buster and ubuntu 19.10 * Fixes: #4090
632023698 Partial revert of sys: windows: use golang.org/x/sys/windows
0a7fd55f3 sys: deprecate EpollCreate1, EpollCtl, EpollWait
7b06192f6 sys: windows: use golang.org/x/sys/windows
1b7d1e81b vendor: golang.org/x/sys 5c8b2ff67527cb88b770f693cebf3799036d8bc0
ddae905b8 Support NOTIFY_SOCKET
b78dfbdfb vendor: golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
ba6796abd vendor: update kubernetes v1.18.0-beta.1
f3d062423 vendor: sigs.k8s.io/yaml v1.2.0
04c805e63 vendor: github.com/google/gofuzz v1.1.0
12c7d6976 vendor: update containerd/cri 1a00c068864a59835ff442e0dddfa5a254be6bb3
5607b23b0 vendor.conf: move some imports to match position with containerd/cri
e3ab8bda6 Avoid allocating slice for finding Process
1239f5403 export cgroups collectors
8c9e84174 RELEASES.md: update release status
e0a8fe7cb vendor: bump golang.org/x/crypto bac4c82f6975
a687d3a36 Check error return from json.Unmarshal
a3ca8a0df Add linux resource oci.SpecOpts
00e6be9f4 Add ctr c info --spec flag to output spec
3be12fe1c Do not loose snapshotter options
8cddb5f91 Pass snapshotter opts during Pull
a3685262f snapshots/devmapper: do not stop snapshot GC when one snapshot removing fails
b6bf7b97c devmapper: async remove device using Cleanup
c7eec0c17 Fix file header in builtins_cri.go
f2edc6f16 vendor: update gotest.tools v3.0.2
026e43806 Update to a released version of opencontainers/selinux (1.3.3)
f8ade8deb Use named error return for service#StartShim
985b26f2f AppVeyor: disable download progress on choco installs
4105135e3 fix killall when use pidnamespace
4dd75be2b Unify dialer implementations
8e448bb27 vendor protobuf & grpc
c134a9bef Use spec's mountLabel when mounting the rootfs
1d888ad6a cleanup the image synchronously for Usage case
18e581dd9 bugfix: cleanup dangling shim by brand new context
fed8890e9 Enable CRI plugin for Windows builds as well
84464b801 v2: Cancel shim log ctx when ttrpc is closed
f3652d068 vendor: golang.org/x/crypto 1d94cc7ab1c630336ab82ccb9c9cda72a875c382
773adf7ab Remove the executable bit for api/*.txt files
8e685f78c support building with BUILDTAGS="no_zfs no_aufs"
61596169b Update .mailmap
f44d36099 Update .mailmap with changes from release-branches
499ab8a99 Update Golang 1.13.8
246a560ed script: use github.com/kubernetes-sigs/cri-tools directly
75d0c5f2e Fix incorrect comment from copy/paste of starting script
0dd6d24d2 Fix reference to LICENSE in README.md
89de113de Support 32-bit userspace on 64-bit ARM cores
d8a0d29c2 Set octet-stream content-type on put request
348e683ce Fix zsh autocomplete script
263ab7014 vendor: bump gopkg.in/yaml.v2 v2.2.8
4c3827889 vendor: update containerd/cri c0294ebfe0b4342db85c0faf7727ceb8d8c3afce
f0652e143 Make tests less flaky
bb8af922b Add support for custom wcow and lcow sandbox scratch sizes
5e6d56ee2 Fix startup_delay within default configuration
833701165 ctr events: do not exit on an error
200241163 vendor: update golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
32ba75f0f Update Golang 1.13.7 (CVE-2020-0601, CVE-2020-7919)
e42110f32 Fix broken link to release-tool
e2e07c9bc RELEASES.md update links to latest v1.2.11 and v1.3.2
0dc69620b update dependencies of containerd/cri
53ced5ffe update to latest containerd/cri (master)
faf03c3d2 Pick up fix for CVE-2019-16884 in opencontainers/selinux
923c05bed Bump to opencontainers/runc new version - v1.0.0-rc10
e44d00865 Appveyor on_success field should be an array.
a224937d2 Disable CGO for AppVeyor build steps
75af17946 Pull: create image record after blobs download
45a17cffb Vendor Microsoft/hcsshim with CGO removal
94964b36d Update Golang 1.13.6
22b73a9a7 vendor: bump containerd/btrfs to 153935315f4ab9be5bf03650a1341454b05efa5d
1189cc40f snapshots: fix flaky TestMetastore
35a8e6e58 sys: clean up process after test
3eb57b01b Added IO metrics
e859b8a92 gc: increase sleep time in test
486d33631 test runtime v2 CPU settings
66508589d fix: eventfd leak for v2 runtime with v1 cgroups
9456040ac fix: eventfd leak
2f0db8e2a vendor: bump prometheus/client_golang v1.3.0
e10c91187 vendor: bump prometheus/client_golang v1.1.0
845b91d6b vendor: bump prometheus/client_golang v0.9.4
04506b87d vendor: bump docker/go-metrics v0.0.1:
99911ea66 vendor: bump prometheus/procfs v0.0.8
ed6ae8186 vendor: bump prometheus/common v0.7.0
c02dc24ec vendor: bump prometheus/client_model v0.1.0
77a3780c2 vendor: bump beorn7/perks v1.0.1
e1221e69a revendor containerd/cgroups
4d62d8795 bump microsoft/hcsshim to 0.8.7
95fbf3dc2 Fix unpacker to pass use apply options
3af3a7602 Fix filter errors
7b52bc506 Add unit test for func in filter.go
cd1cad9d5 Support disk usage in windows-lcow snapshot
f3090ce80 ci: set pipefail in zuul script
90cd777a6 platforms: fill default arm variant when parse platform specifier
b553bc14a update docs/rootless.md
94d499843 Add Makefile variable to skip test packages
123af61c0 Add Cleanup to snapshot API
465c11dc8 Fix build with gccgo
52e477f94 Fix outdated comments
b127b666a ctr: support $CONTAINERD_ADDRESS env var
a4b423b19 overlay: test actual Opts
067a66b90 .travis.yml: run test with crun
1fb1d9321 v2: Fix missing ns when openShimLog on windows
a18f77bea create local version of introspection service
e739314ed mount: support FUSE helper
87e2a9595 Fix a typo in task.go
d82fa4319 v2: Call shim.Delete at first when create is failed
493a36de9 Move label filter to snapshots package
06f6ea099 switch nighly builds to Go 1.13.5
c07e356d2 Update Golang 1.13.5
072dfbaf3 Support pushing a specific platform of a multi-architecture docker image to a registry
4ccb7aa22 Enable to propagate necessary information to snapshotter during unpack
496836c09 Update containerd/console vendor for fix
a057bfbd7 Add more adopters to ADOPTERS.md
facedf898 Remove an empty line
05d192929 Update checkImages to accept images.MediaTypeDockerSchema2Manifest
c4ed3ff1e Replace ocispec.MediaTypeImageManifest with manifest.MediaType
fbd46d709 runtime v2: Close platform in runc shim's Shutdown method.
02dcf384b Disable criu tests in Travis CI
62adc516d sys: mkdirAs: do chown if dir already exists
49e7039a8 cpu metrics consistency
b9d9bdf1f make cpu metrics consistent with v2 docs
929ab521c fix system usage naming
659c971ca task metrics fix
23dbae3e7 Schema name fix
17d61d6b7 Units fix
f287bc229 Schema names fix
6bfb24824 Fix prometheus metrics units
b98cc7918 Added memory and cpu metrics for cgroupv2
75efbaf67 Attempt to make device mapper snapshotter tests less flaky
9eef69e3a Update after review comments
43fca9eba metrics: rename pids_v2 to pids
a022c2181 Improve host fallback behaviour in docker remote
fa62b6d23 Use logrus instead of printf for warning
08517e586 Allow empty scope authorization
499fbb033 Improve install scripts
e0011978f start.go: Improve help text
9862cb8f8 support user remapping in ctr
b02e20f12 cgroup2: enable controllers automatically
8f870c233 support cgroup2
caeacfce3 Correct grammar/typo in BUILDING.MD
51a6813c0 Split uid and gid user ns remapping in oci
30d92eff1 Defer layer download until unpack
9d5a095b0 Bump containerd console for os.File changes
cd23ad244 Bump go-runc for buffer race fix
6a22a8fc9 Return the underlying images metadata
787be0efe Modify ctr run to search for read-only flag instead of readonly
cfb4f734d Make sure for next release branch appveyor runs
f92470b3e Fix dependency in BUILDING.md
a6b6097c9 Fix container pid.
726dcaea5 update cpuinfo to make variant matches aarch64 and so on
6fa9a42ea vendor.conf: sort imports alphabetically
a44189d2f vendor.conf: pin all dependencies by git-sha
55ea3dc9b vendor.conf: reformat to use columns
8da434668 Fix cleanup error on content client test
252d6550f Update cri and docker vendors
8a66dc6ed bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
526c0db69 Support target snapshot references on prepare
d1261b508 Update snapshot parent filter property to always exist
11ef041ff Update golang.org/x/sys to recent commit
afd33bce8 test add tests to spec_opts
731e144a4 devmapper: update example base image size in README
19f7f3ccc test: Do SynchronousDelete cleanup before testing ImageIsUnpacked
0bb48aef0 Add `--log-file` flag for windows service.
c56059162 Avoid deadlock in unpacker.
32ef2e630 Update README
82651d386 Cross build nightly builds (arm64, s390x, ppc64el)
c479156b8 Add Github workflow for nightly builds
856ea3055 Add client unpack opts
3db1c3b8f Better support windows binaries.
843423ec3 snapshots: return error if readSnapshot fails
5bf2c6fc2 Fix panic on reference.Spec.Hostname()
fda652be5 Update name for btrfs headers package
a647407ca Fix dependency in BUILDING.md
608791bfc Update to Golang 1.13.4
cfb425fc1 Update .mailmap to reduce duplicates
15669a1d3 Update to Golang 1.12.13
8f74de9e9 ctr: allow specifying --runc-systemd-cgroup
7f5d90076 ctr: allow specifying --runc-binary
0f4374169 Add proto path /usr/include to Protobuild
4c99c8132 mips: -buildmode=pie is not supported for the mips arch
fdf7a795b Clarify requirements for identifiers validation
76aa4e546 Use common identifiers package with less restrictive regex
84879b7c4 Add CGO makefile flag
7c016b655 add tests to server_test
8f9eff4fe Support disk usage in windows snapshot.
d21f0f116 windows process shim installer
a2688b972 bring back aufs and zfs
78be73662 Return not found error if no platform matched.
d12b53a07 ppc64: -buildmode=pie is not supported
5e5584196 Makefile: Drop vndr whitelist
20e844a22 Use logrus trace support.
66aa1d3ef Add snapshot walk implementations
e8c14c07c Added filters to snapshots API
f593efdf0 RELEASES.md: 1.1 EOL
aaccfcbe2 Fix `containerd config dump`.
c224edc5c apply: use naive applier when running in UserNS
37b56cafc Add ctr metrics support for Windows/LCOW containers
178469e2a Update Microsoft/hcsshim vendor
3bf461ae8 Move autocomplete files to contrib/
885232b72 bump google.golang.org/grpc v1.23.1
6356e55be Update Golang 1.12.12 (CVE-2019-17596)
074b453ac vendor: call vndr to remove useless pkgs and update vendor
7177af84a Allow 202 response code for commit
d52cbc19b snapshots/native: ignore xattr errors during CopyDir
f8cca26f3 Handle large output in v2 shim with TTY
d5b7bf51a Move flag.Parse in tests to TestMain
54257bb5e Add local-fs.target to service file
a6d3f4d30 Add device opts to ctr --privileged
ffcb1cc9b Fix delete error code on the containerd daemon side.
036db34f3 build: Fix manpage generation
06be794cb Fix shim delete error code.
901bcb223 Add distribution subpkgs to core
eaef634ef version: use runtime.Version() directly
25947db04 Add support for spec generation with host devices
c0984941e adding go version to client description
fe947e83d bump runc v1.0.0-rc9
772032598 Fix flaky btrfs test
e4e7e554d Make client's WithLease more flexible.
18be6e371 Use cached state instead of `runc state`.
f277665ed Bump runc to 1b8a1eeec3f337ab5d94f28980
e33f70385 Add more detail on releases
8ff5827e9 Update cri and cgroup packages
b5fa55b0c ctr: Enable shell autocompletion
45ce73567 Limit travis release script to a single build
0cb7e4d5f Perfect documentations
b172b7f9d Update release docs for 1.3.0
394db03f1 Fix all media types in Accept header to match RFC
90735a5d1 Update cri to 5d49e7e51b43e36a6b9c4386257c7d08c602237f.
1b1b862eb Get CRI dependency versions from containerd vendor.conf.
35d3bae1e AppVeyor: bump golang 1.12.10 (CVE-2019-16276)
95dbbdc8c Bump runc for CVE-2019-16884
62c2eea78 fix-up typo
c5821baa4 Sync and stat btrfs loopback in tests
5ea936362 Perfect documentation
a0ae24b98 Word spelling correction
85eac2550 Add release note for gc fix
cbbb6a229 Update release note.
fc31fa176 Update cri to 4ea022f82a55c449bf15bfc62ac8b0de968d81be.
0b224ac7d Update metadata interfaces for containers and leases
2a636f8c3 gen-manpages: Create man directory if it does not exist
0a2129222 Check for more kill error types
dd5122809 Don't search for state.json path
6f31417d4 Generalize media types
f3148d0b9 Add metrics type alias
57b51b948 Move golangci-lint deadline to config file
e84a84a5a Add function to set custom auth scope in context
bca374aa1 Get media type key from context
20d3fae3d Add Opt for modifying shm size
83a72858f Makefile: increase deadline to 2m for golangci-lint
b4211d94e fail on file not found for shim reconnect on containerd restart
fd6299be9 Fix density spec generation
3bc99755d Try set GOGC for golint
19ecd49ed implement ctr -connect-timeout
58892a3ba Skip darwin deploy
5bb0281d1 Fix missing vendor packages
5a656cacb Move manpage gen to separate binary
6ed809168 Publish cri release to gs://cri-containerd-release.
f997c30ec Skip cleanup in travis deploy and avoid gcs race condition.
36c543a72 Remove extra CI testing on older Ubuntu
4e8a49948 Encrypt the secret file in containerd/containerd.
f3a5b8c0a Add command to generate man pages
d1a12823b Update gcs cri release.
424d33c5b Update go-runc to e029b79d8cda8374981c64eba71f28e
3db5a5ad2 Fix darwin build for cri release
1b4cec979 Update cri test to fix image reference test and fix gcs deploy.
e3abd03ae Fix CRI release build.
61f113e60 Automate CRI tarball release.
c1fc21e92 ctr: use NewDockerAuthorizer instead of deprecated NewAuthorizer
fa11147e5 Add --env-file to ctr
5c576b026 Update and simplify mailmap
c8cb864ce platforms: update known OS and arch values
3d1fdaccc config_test: sort result before check
8788af7f8 modify-document-duplicate-word
d6a6e0b8b Support foreign and encrypted layers in the unpacker.
a4482d9a6 Fix proxy plugin config validation
01f726589 Support v1 configurations for config dump
cd79e0edf travis: fix Xenial tests not being run on master
555cb31fd Support configurable default platform in the client.
c410f0eae Fix potential panic for task in unknown state.
dd24d76a1 Fix potential containerd panic during graceful shutdown.
fa546dc3e travis: don't run old Xenial LTS on pull requests
94e4b6879 travis.yml: add TRAVIS_DISTRO env-var for easier identification
214b8328d travis: add Bionic (Ubuntu 18.04 LTS) to test matrix
b6c811b7a Update cri to 0165d516161e25e52b4ab52a404a00823f8f0ef6
db3a71173 Add 'containerd config dump' subcommand
779701b29 Add --seccomp flag to ctr
86f8be86e Add sigprocmask to default profile
f4927a298 fix mis-spelling in nvidia.go
bc692cc59 Use default UNIX env when image has no environment
a292bf0f2 bump containerd/zfs 2ceb2dbb8154202ed1b8fd32e4ea25b491d7b251
97962976a Update ttrpc to 92c8520ef9f86600c650dd540266a00
92a5b08a6 fix-grammar-mistake
372472b5f archive: truncate modification time
2d8a65b1b Export shim publisher functions
6624a70d9 runtime/opts: move WithNamespaceCgroupDeletion from containerd to its own package
8266a3c5e fix-up spelling mistake
09b184c15 rootfs: use new ctx to cleanup instead of canceled one
2f54a7cb6 bump containerd/ttrpc 9abb3e268010ea188f4e4051f77eb5aca49315fb
eb7a6bf02 bump google.golang.org/grpc v1.23.0
56bcc7767 Handle layers with the same digest in unpacker.
6f8fb9ee5 add WithImageName container opt
a40c3830d Add option to pull all metadata
55f737bd3 bump hashicorp/golang-lru v0.5.3
ed1df65c2 bump hashicorp/go-multierror v1.0.0
cbb3a3790 bump hashicorp/errwrap v1.0.0
5cab0d3f3 update the max if cur will be greater than max for setting the limit
24b9e2c1a Merge configs section by section
8ebffecbc Use map for stream processors
aae2d0d75 delete unnecessary checks and fix a test
9e183f5e5 add cli option to download all manifests
ea6c749e3 Update config doc
19cd0a4f1 Append slices when importing config files
b5f03eacd Pin to libseccomp 2.3.3
4d11bb36a devmapper: activate dm device if snap device marked as activated
bca085753 Fix toml plugin decoding
a1e3779ca Support config imports #3289
6e2228df7 Vendor github.com/imdario/mergo
6cf031e1e Pass ttrpc address to shim via env
89eae6429 Cleanup: fix some typos in code comment
d7e1b2538 Allow explicit configuration of TTRPC address
03aafaa1c Update the integration test.
60f73b6cf Support simultaneous image unpack.
550518ab8 Read trailing data on apply
348e9f7c3 Update release notes and mailmap
8acf5a142 Update release note for CRI plugin for 1.3.
041e9debb Revendor github.com/Microsoft/hcsshim
21174cb49 Change bufferSize back to 32
1073868e5 runtime: only check killall for init process
64a0b2eb2 Revendor to remove unused dependencies
7379fa663 Remove the process default ENV
5023d96ad Remove Windows EventLog logging hook
276363938 Try to preserve exit event order
04caf1fc4 Ignore fifo error when using v2 multi-container shim
9cbd18ac7 Update cri to f1d492b0cdd14e76476ee4dd024696ce3634e501.
bcc4a146e Support applying with parent directories
5a0ff41c8 Update continuity vendor
80d31d15b Update fifo for typed errors
6d0e355c6 cleanup code typos in leases.go
bee4c1a8a Add retry and non-blocking send for exit events
0d27d8f4f Unifi reaper logic into package
bb4c92c77 Fix shim hung
1c30d4d04 bugfix: override image.Env with process.Env, rather than be contrary
7682acb9e AppVeyor: update to go 1.12.9
81386df91 Add direct unpack support for overlay and aufs
1b389b362 AppVeyor: update to go 1.12.8 (CVE-2019-9512, CVE-2019-9514)
2e8ea9fd6 Allow timeouts to be configured in config
a80db38c3 blkio.go: correct help message word spells.
3ef26cd87 bump x/sys to fix riscv64 epoll
2ff7183cc AppVeyor: update to go 1.12.7
c017e0efe Use a child context for errgroup in dispatch
75771c463 Add usage function to client
b6fca48fe bump go.etcd.io/bbolt v1.3.3
0dadef19c Add docs for stream processors
d085d9b46 Remove encryption code from containerd core
282b19efd remotes: remove useless line
a3a30635e namespace: Copy ttrpc metadata before setting header
04b7f1b59 Remove ppc64le from travis
2fac3ee27 Add release notes for stream processor
116140977 Limit multiple platform manifests to one for size check
fe3638e88 Add UnpackOpts to RemoteContext
d8322e38c cast Rdev of Stat_t to uint64 for mips
af7b7cdb0 Save default namespace in the client.
552a0b1be Handle stderr in stream processors
3fded74bc Add unpack opts
26b90619e Pass apply opts through rootfs/* code
e1489f93c Use named pipes for windows processors
134d3c815 Add windows apply code
f867401c6 Use fds and pass Payloads over diff api
366823727 Add server config for stream processors
97a98773c Add StreamProcessor for apply
0bc5df035 Clarify text on `ctr` support/inclusion
0a3769eec pusher.go: error message typo correction
635ccc067 Add cri release notes
4667ee47a Update Microsoft/go-winio v0.4.14
7792c23b1 Limit default matrix to runc v2 runtime
9f0bc2b53 Add UUID and server info to introspection
08483d18a v2: Close ttrpc connection when `Delete()`
4b5dfaee1 Completely remove Windows v2 in-tree shim
2398421d5 Fix travis matrix
a5940da62 Remove `ctr cri load` and update cri-tools to v1.15.0
0a4bf1bd1 Mark faulty devices
c99961c6c Update cri to b213648c5bd0a1d2ee42709c10dff63fbfee3ad7
4b4ce4a26 remotes: remove unnecessary string formatting
d1b9ee543 travis: Enable travis CI for ppc64le arch
bb9968891 Fix containerd on windows.
3e52e2902 Fix bug in export named manifest option
594f42319 protobuf: Bump Protobuf version to 3.7.0
c965a6c4d Prevent push by tag for sub-manifests
5cf79913e gpg: Use a Pipe() rather than a file
6a2512879 gpg: Pass the passphrase to the gpg2 tool using a file
3741fd859 Remove deferred flag when removing devmapper device
b16e7c5de Update pkg/ttrpcutil with improved pipe dial logic
daf12cd19 Improve error return from AnonDialer on Windows
4d5a0e19e Mark faulty device in one transaction
878a3205c Better error recovery in devmapper
578216950 Add note about pb.txt files
f68186e10 Improve custom cgroup test
8a6190856 Add 1.3 beta release note
612628c2f fix wrong spells in compression.go
98ead46d1 Call Update of snapshotter plugin
f543f2fbc Call CloseIO when stdin closes in ctr
eb4b3e877 Fast path getting pid from task
8cd480c23 Specify protocols in ctr encrypt recipients
e3cc9c20c bug fix:#3448
c27e48d66 fix mis-spelling in client.go
22f44c44d Add garbage collection doc
02826345c Add option to compress blobs on import
9da7d3036 archive: return chtimes error with path information
3d1fa6969 Implemented constructors for both encryption and decryption
392668d00 ctr:Support deleting multiple tasks at a time
05a2b63e8 Create CryptoConfig constructors in place of dcparameters
1c7eab197 Allocate a conhost during Windows service startup
364de4c35 Wrap creation of CryptoConfig in constructors
51bc61533 Update releases doc for 1.1 release
101d4b78e Add timeout to task state calls
e097ab8bb Disable windows integration tests
f055bdb0a Remove windows v1 runtime
d531e7849 Modified image_enc_test to use a different image from other tests
5e5ae23d8 test: Check manifest.Platform before dereferencing
1945e26ac Add concurrent execs in stress tests
ffa86b25f Add new shims for checking binary sizes
c118c45f8 Change image_enc_test so that it more reliably delete images
c6d437fd7 Corrected lease implementation
c00517a94 Made fixes and optimizations to encryption GC
725d3ad8c Add --device flag to ctr
518be1cb0 Fix bug in setting request body
dd0a45dfe Add flat GC label for leases
dca17853d Add WithLinuxDevices Opt
804ae89be errors: use errdefs errors in client and commands
dde436e65 Crypto library movement and changes to content helper interfaces
bf8804c74 Implemented image encryption/decryption libraries and ctr commands
30c344394 Add crypto dependencies/vendoring
a1f3ebaec Update cgroups to c4b9ac5c7601384c965b9646fc51588
b72673fdc Makefile: allow custom base path to install
fab016c7a runtime/v1/linux: ignore ErrCgroupDeleted in Task.Start
ce0d2489a Fix regiression from #3403 with snapshot cmd
0b29c9c37 Update resolver to handle endpoint configuration
63ceaf877 Add testing log context
f63eab32e Add testing log hook to context
61d930ad5 Move specific errors to their respective packages
82826df9b Small refactor due to CI linter changes
ef7f46eb7 Fix linter errors
2b521e25a Switch to golangci-lint
abc152d14 fix name in containers file
70b00a0fa fix variable name
4988424fc * fix: view snapshot is deleted before diff
db95af43f centralize harded-code message
d643f1dc8 images: only fetch the best matched manifest info
550a6f1d7 Fix integration tests
1918ee4d1 Respect default snapshotter label
47d2ac090 Improve default label handling
4e2fc81ed Add aliases to namespaces subcommand
2a92c2741 Bump travis to criu 3.12
5ed1a3ce0 Add RELEASE note about config versioning
6601b406b Refactor runtime code for code sharing
7d2117245 Fix metadata content store to call writer digest after commit
af93e4009 ctr: Add images tag subcommand
ec8d9d3d7 shimv2: remove the dead task from runtime task list
d3e1a51f8 vendor: bump go-runc
46af8ccd2 Check exec log flags compatibility
9fda4a5fe Bumps the version of go-winio.
6b59b425e Support --log-uri for exec subcommand
844c58102 Add cgroup delete opt for ns deletion
3d3dbc8fb Handle RequestTimeout and TooManyRequests
7dfc605fc Set shim OOM scores to +1 containerd daemon score
719a2c594 Robust pid locking for shim processes
2d0379115 docs: remove shim_no_newns in ops.md
0886e4f1b No need to keep 2017 DockerCon doc
650a7e5c1 Add hashsum for release archives
cb4a8f51a bump runc v1.0.0-rc8-32-gf4982d86
bb41ef87f bump libseccomp-golang v0.9.1
174c4907d Fix shim's file IO logging
1a8df3f23 Reserve exec id to prevent race
245052243 Add timeout for I/O waitgroups
12a14c442 fix: polish log to make more clear
ec78305c4 Close the inherited socket fd
fbf96d302 Fix path in LogFile creator
63a8dee60 Switch to GitHub's new issue templates.
341c7c144 Update dependency containerd/cgroups
5e0d79380 Fix bugs in BinaryIO creator
75f183887 Allow opts to flow to the backend snapshotter during snapshot creation.
95f9bbf18 Add timeout in load shim v2
62e9e1169 switch to a working link
41e1bb832 Fix snapshotter getter in client code
052551573 Ensure labels is not nil in differ
67cf9f7f0 AppVeyor: Bump golang 1.12.6
0b7abc02b ttrpc updates for interceptors, close, and metadata
d15a06b19 docs: Fix typo to some markdown files in /docs.
dd7c0aabc remotes: support cross-repo-push
bca566736 Make newBinaryIO public
31afff294 Fix backwards compat with v2 containerd configs
bb0087280 Add user agent header to all requests
9547d269a Add v2 server config support with plugin URIs
9e0cd529d fix shim std logs not close after shim exit
fb6b0ae4c Update x/sys, x/net and bbolt modules to support Risc-V
ed308ea1e Unmount rootfs with separate Remove() in bundle
cf7fb14ef Update timestamp atomic write
4f6ba8286 Ensure close in content test
faf925ba2 Handle EOF from ReadAt in content.ReadBlob
fa6a9f063 Add ttrpc namespace support
42f24b57e Update ttrpc to a5bd8ce9e40bc7c065a11c6936f4d032ce
7531c66d5 Ensure that the rootfs dir is created in the bundle
bf24fb0ca Close file r.log after used to release resources.
5b9a43d2e Fix seccomp contributed profile for clone syscall
cee19d1e6 Change restart delay for Windows service to 15s
8a388d623 leases: support resource management
ac4485c76 Add support to gRPC errdefs for context cancel/deadline exceeded
bbe45e446 add Restart=always to unit file
a274dbe82 Fix run with specified platform
48b81e872 Do not return error when rootfs already exists.
e0c4fe411 Forcibly sync writes on lcow layer.vhd after write
5e2d7efd8 Use a single custom annotation for export
41b7b0e0d Ensure namespaced writer commit has correct namespace
7f79fbb24 Move ttrpc client to pkg/ttrpcutil
5b7a327c4 Improve atomic delete
fe6a2b03e Add shim cgroup support for v2 runtimes
62609d66d Fix typo in description comment
90c6c1af4 Pass options on shim create for v2
690706286 ctr: make ctr shim command easy to use
7b06c9a1c Add TTRPC client
5e962dd8b Remove unused Resize method from initState
66036d920 v1: Respect the `shim_debug` flag when load tasks
a6a888cb5 Bump ttrpc
fbb80b951 containerd-shim: redirect output into stdout fifo
543d1e807 Add travis_wait to prevent vndr timing out
00bc2f5cf Update to Golang 1.12, and prepare for ppc64le
67b45aef4 Add WithoutRefreshed metadata
ad25c1a9c Improve ARM platform matching
bd27bef4a Move checkpoint and restore commands to new files
cf6e00854 Fix fd leak of shim log
6f463d350 test/snapshots: umount before committing snapshot
388705317 snapshots/devmapper: deactivate thin device after committed
bdd7dce31 Add OpenLab CI configuration
660554d67 Fix error handling for task deletion.
2ed8e60fa bump google.golang.org/grpc v1.20.1
d1c59513d bump google.golang.org/grpc v1.12.2
2f22d8e67 Fix broken link to containerd logo
cb7c780af ctr images import: add --no-unpack option
ee902afa5 Compute manifest metadata when not provided.
5c9811ded Cleanup dead v2 shim.
cfc36388b Remove redundant error checks
38e369657 Use cancel on errors
eded188f4 Fix misspells
969035bcb Stop logging error on v2 multi shim log failure
c7f067f27 Update vendor/ with new required vndr go.mod files
8c5779c32 bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636
dff745680 Return NotFound error for kill and delete in deleted state.
5d17ed230 Update cri to 2fc62db8146ce66f27b37306ad5fda34207835f3.
e5aab17a0 bump opencontainers/selinux v1.2.2
dd85aea62 bump runc v1.0.0-rc8
5b9bd993a differ: fix deadlock on commit error
48f46516a Support disabling default setup of shim logger.
c79c7921c bump docker/go-units v0.4.0
dfa51c927 runtime-v1: kill shim in cleanupAfterDeadShim
0376dd460 Don't write dumped stacks to file for ETW capture state
e6fc0ed22 Convert Windows CI to use Microsoft MCR image urls
06a3a480c bump containerd/console 0650fd9eeb50bab4fc99dceb9f2e14cf58f36e7f
a333dbcfb Update x/crypto to 88737f569e3a9c7ab309cdc09a07fe7fc87233c3
0fd02564a bump gocapability
7718d060e Write stack dump to `os.TempDir()` as well
a4942ca4f Fix error on pull hang in CI
6bcf463b0 Move to sha-specified test image for nanoserver
cfb8b5573 .mailmap: update Akihiro Suda's email address
be2cbd0b2 Access to client's GRPC connection object
78f3dc433 Allow dumping stacks via ETW capture state
05dd66b2e Update go-winio in vendor.conf
c9059c767 bump mistifyio/go-zfs f784269be439d704d3dfa1906f45dd848fed2beb
63c7a879b Requeue events in the shim publisher
fc167f957 Correct PusherFunc helper to match Pusher intf
a7af3c13a Correct import path in services/server package
9cc58781f Check task list to avoid unnecessary cleanup.
97d247cd0 Rename `hrpc` to `tcpServer`
047348e19 Add dialer for events service
ae87730ad Improve shim shutdown logic
a12f836d5 Use $TEST_RUNTIME for cri test.
4b3b99ea1 Add support for required plugins.
4ba756edd Fix API forward events for shims
1a1f8f11a Set nofile to 1048576
b911ae342 Add tcp service for grpc listeners
a6f587e4c Use ttrpc to publish runtime v2 events
a8a805cad Add ttrpc server to containerd
c93d64543 Add GetOOMScore function
ae5ca8177 Refactor mount path check and add comments
7045801fd delete the ingest when any errors happen during resuming status
dcf6023c4 Extend release timeline
d5b770aa8 Introduce 'clean-test' target in Makefile
2583d9e42 update gogo/googleapis v1.2.0
a98df70da update containerd/btrfs af5082808c833de0e79c1e72eea9fea239364877
aa8dccd22 update containerd/aufs f894a800659b6e11c1a13084abd1712f346e349c
ed61d7f68 bump containerd/zfs and dependencies
d667628ca bump github.com/pkg/errors v0.8.1
68ef17835 bump github.com/BurntSushi/toml v0.3.1
1978c0b74 bump gotest.tools v2.3.0, google/go-cmp v0.2.0
2741dbe2c contrib: Dockerfile: bump go 1.12
a84f87d84 contrib: Dockerfile: add a base stage
a07e12cde contrib: Dockerfile: reformat, and use --no-install-recommends
ba9e1ea23 contrib: Dockerfile: use build-arg for go-version
4754d2aee Update image export to support Docker format
74eb0dc81 Return event publish errors.
10cf21dcf Export ExitStatus init func
a73358749 Update cri to 6d353571e64417d80c9478ffaea793714dd539d0.
de1da8be3 Update handling of registry errors
8d1ae237e Always add compressed blobs to Docker import manifest
c0f0b2131 Apply PR feedback
2a5e4c4be Skip rootfs unmount when no mounts are provided
abfc89ce0 Update CRI to master
4730088cb Update runc to resolve selinux issues
2d11f5e6d Regenerate protobufs
830b0294c Update protobuf v1.2.0
7c1365b46 bump sirupsen/logrus v1.4.1
01310eaeb do not use unkeyed fields in compose literals
90085a7ac Add empty file to prevent build from failing
baf340343 Extend Applier's Apply() method with an optional options parameter
8784eb630 Move snapshotters benchmark to a separate package
adc4fa217 Use pkg/errors for all errors
c22effb16 fix parseInfoFile does not handle spaces in filenames
559dfa59a Add configurable plugin path
d9526f5c4 Move CloudFormation template to contrib
ae04c1660 runtime: guard Close() until both streams are complete
e96ac2040 runtime: log IO error when copying output streams
515be73c8 Add snapshotters benchmark
872296642 fix shouldKillAllOnExit check for v2
fa5f744a7 fix shouldKillAllOnExit check
f7f6dd7b4 test: add custom cgroup test
2b8df8309 bump containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
bc6ac0878 update opencontainers/runc v1.0.0-rc7
808b22353 Fix race and panic.
87289a0c6 devmapper: implement Usage
010b4da36 devmapper: implement dmsetup status
871094016 Windows: Build shim binary from Microsoft/hcsshim
e16e99593 Vendor Microsoft/hcsshim@8abdbb82
5d50b9c2b Extend adaptImage function with annotations case
388c8a176 Fastpath opt and ExecProcess loading
a84966451 Windows:ProgramFiles to ProgramData
6034c1950 Windows:Create root/state with ACL
7361b1987 Update Windows lcow differ to set NT VIRTUAL MACHINE\Virtual Machines SID
4c9b5ef8e Update vendor github.com/Microsoft/go-winio
d15832a4c Address review comments
8f8fd3c3a seccomp: whitelist statx syscall
908b77108 Add code to return message field of returned registry errors
9a8727cf0 Allow to import an image for the default platform only.
4506eb45b seccomp: whitelist io_pgetevents
f3ff95ab7 decouple api.ContentServer implementation package from bbolt dependency
14a050688 ctr: fix image cmd ArgsUsage
bdd84abf0 Add additional capability handling opts
a631796fd horten the unix socket path for shim
b858cfb41 Makefile: allow overriding package name
7ca2c3d68 contrib/nvidia: export helper binary path and list of Nvidia capabilities
a7aeffc22 Update mailmap for cgroup authors
e6ae9cc64 Shim pluggable logging
506b81548 remotes: add distribution labels to blob data
b8d40b353 update runc to 2b18fe1d885ee5083ef9f0838fee39b62d653e30
09cf2a629 Extend metadata images test with fieldpaths for Annotations
5124f9ee5 Write the Annotations map into the bolt db
02cc1485d Prepare boltutil for reading and writing another map
1e893b19c devmapper: add no_devmapper build tag
79248fea2 Add test for ocispec.Descriptor Annotations
34f377295 Allow WithNewSnapshot and WithNewSnapshotView to take in snapshotter options.
aaae81189 Update checkpoint opts with runtime handling
160737d2c Fix no pivot and keyring opts
0b711d616 Copy annotations around where necessary
4d2a26d75 BUILDING.md: update testing section
6424a3603 ctr/commands/images/push: don't show progress if it is debug mode
7cfb99ab9 Add content gc ref labels from containers, images, and snapshots
f0d5dd3c8 Use unix.SignalNum in ParseSignal on unix platform
1745951ba Vendor golang.org/x/sys d455e41777fca6e8a5a79e34a14b8368bc11d9ba
e13a4b67e Update the snapshotter docs to refer to the snapshots package for WithLabels.
277147135 Fix issue with NewFIFOSetInDir with Terminal true
828f6eb84 Fix a bug in shim log on Windows that can cause 100% CPU utilization
c6703d4c7 Add missing annotations map to Descriptor for gRPC transfer
d2bec5422 Bump cgroups to dbea6f2bd41658b84b00417ceefa416b97
208957ba3 devmapper: proper cleanup in pool device test
734989c2a Update README
fb8048371 docs: Add NAME section in all manpages
95f0a4903 devmapper: rollback thin devices on error
adf5c640f devmapper: don't create or reload thin-pool from snapshotter
7efda48c5 devmapper: more precise way of checking if device is activated
37cdedc61 devmapper: add linux tags, fix build
0c6d194cc devmapper: add README and minor fixes
2218275ec devmapper: register plugin
cec72efc2 devmapper: add snapshotter
3a7588252 devmapper: add pool device manager
6e0ae68e1 devmapper: add snapshotter config
fcd9dc274 devmapper: add pool metadata
809e5fd3b devmapper: add dmsetup
fe05e4d1a devmapper: add losetup
d83e4e9b3 Vendor Microsoft/go-winio@v0.4.12
e0d7ed12a Windows: Enable ETW logging
cbc032ed3 Update go.etcd.io/bbolt to v1.3.2
5e8406984 Update travis to xenial worker
84a24711e Add runc.v2 multi-shim
6bcbf88f8 Move runc shim code into common package
fd6ac5d02 Vendor sirupsen/logrus@1.3.0
b553a12be runtime: allow specifying supported platforms with config
f6ac73d71 fixing typo and added a missing comment.
4b3e0a8aa metadata: merge snapshot labels with metadata's labels
88f19a90a Windows: Update stackdump event name
14f7e5272 Unpack should set 0755 when the parent directory doesn't exist.
a6f43b549 Add website update to release process
17b2c8498 Update supported versions
b87e9eef3 Add ExecID for StateResponse
bfb266ab5 Fix some misspells in helpers_test.go
dc09ed1e1 Add image handler wrapper
a4f7b3758 Add support for TaskDelete event on exec in RuntimeV2
00895670e Stop sending stderr with TTY on Windows
6a21728fb Use defaults package for listing namespace labels
14eaad0cd Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736)
98766e863 Vendor opencontainers/runtime-spec 29686dbc
225d9b120 Fix LCOW layer ordering
0190e5f39 Removes the oci.test.exe binary.
525802f9c Use distribution's reference.ParseDockerRef
3538174e6 Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
2dacef07c Add shim skeleton code
59ea134ce OCI Modifiers for Windows
d25007e54 Add structure documentation for metadata
823b7a8a0 Cleanup releases directory
7bd8dcd0d Fix potential containerd panic.
41f540621 Add release documentation
f014adfa1 readme: fix example for checkpoint
dfcc5942f Fix deadlock in Windows runhcs shim exec
da2ab865e Add documentation for using namespace labels for configuring defaults.
952d58297 Add a separate lock for pid.
9777d7689 Revert "use state machine management for exec.Pid()"
34323985a Use labels only when default namespace is provided and prefer given options.
59432aaec Take default runtime and snapshotter from namespace labels
6629f853a BUILDING: update BUILDING.md
d7ed40307 Add image pull concurrency limit.
7f5d7ff6b Update snapshots docs with garbage collector label
34672d483 metadata/gc: remove the noop-loop for snapshot reference
6ed293ba9 Fix bug in shim path lookup
d63099c4a Allow matching shim path side by side with containerd
764afa0d1 Include extension for shim binary format on Windows
dfebb404c remove excessive []byte(s) conversion
85aa8ad36 Move task events to runc v2 shim
28f8a90bd Update cri plugin to 4dd6735020f5596dd41738f8c4f5cb07fa804c5e.
bb32c0f61 Revendor github.com/Microsoft/hcsshim v0.8.4
f44469698 Return out of windows signal handler
26ab393e7 Use context.Background for `O_NONBLOCK` `OpenFifo`.
7db569771 unix.UtimesNanoAt now supported on Darwin
132ee9b82 fix: linter issue
6468619d7 Implement the Runtime v2 Shim async task model for runhcs
b444d7d50 Handle additional cleanups from prior PR
4ef9bf5c8 Windows: Publish exit status correctly in TaskExit
90caf6f6a Windows:NewDirectIOFromFIFOSet
3aec9e7be bump up runc
0befa457d Update ttrpc to support context timeout.
946e40266 Update releases files
c5a8c9fc1 Fix issue in runhcs shim CloseIO
31616e794 Fix runhcs shim bug in Create with "len(Rootfs) == 0"
bcd4cc51c Fixes a bug in runhcs shim Exec.Pid
bc76e01a8 Update runhcs options to include CRI Sandbox support
a79879e9d Add security audit report to README
dee0945e1 Fix spurious ttrpc client shutdown error log on success
64a004641 Update cri-tools to v1.13.0.
b55c9c6c3 Update cri to 4b4b2abb2eb19ad6913a6c5d2a6869a0a43a3fc1.
17b77aeb0 Fix annotation typo errors
5137fc6f1 bugfix: support application/octet-stream during pull
568b5be93 runtime: add Add/Delete method in PlatformRuntime interface
7faaa64cf fix: miss remove temp file in createSnapshot
4247f2684 metadata: define content sharing policy
1be86af10 add test for WithImageConfigArgs
36e4dc603 Ensure bundle removal is atomic
723797d32 docs: remove website leftovers
d4ecb00f6 checkpoint: return empty image if checkpointPath exist
f2344db40 do not mutate defaults in replaceOrAppendEnvValues
da9471fb1 fix oci.WithImageConfigArgs for windows
897afeaf3 Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
0ec6526fd Update the delete docs for Runtime V2 on Windows
e20ba5fa5 test: add test for c/r without image
40267382c fix ctr image export not found error
8be05eb23 Fix freebsd build
7b1e6f323 fix: use func args instead of build new one
9baecf66b fix: fix defer in loop
903abf33c Fix annotation typo error
52de37170 Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)
2d96aad77 bugfix: unpack should always set the snapshot gc label
a2a424197 Add timeout and cancel to shim fifo open
6f944e419 fix: SCHILY.xattrs should be SCHILY.xattr
6ccb0d062 fix: remove dead code
2db0c6c26 Explicitly stating utf-8 when fetching oauth token
603e97a9e ctr/content: make editor flag is required
7ac221e8d Adding ctr memory and cpu flags
822ae18b1 Update cgroups to 1152b960fcee041f50df15cdc67c29db
3ae8e8a30 Add shim config for shim binary options
66c20f2b7 Update runc to 96ec2177ae841256168fcf76954f7177af
79499980e Kill should still work in stopped state.
27ba2db10 Revendor github.com/Microsoft/hcsshim to v0.8.3
2d3a4f99e should no defer when detach
70084ea6c Add /proc/asound to masked paths
6daf8b778 Eliminate misuses of errors.Wrapf
a404f27a0 Add more adopters
6593399e9 cr: support checkpoint/restore without image
996c60616 fix: fix error info start capitalized
b4a642f6a Add dumpStacks support for containerd on Windows
40d898a82 Windows: Allow running as a service
97dd5df66 Update runc to v1.0.0-rc6
09bf314bf Cache shim v2 exec.LookPath results
fd16bf6d4 runtimev2: add image-path and work-path for c/r
83ebcf999 runtimev1: add image-path and work-path for c/r
f90e5d564 Move ctr run --isolation to Windows only
bbc2a995f use state machine management for exec.Pid()
461222dba fix: should get runtime name from container info
2101b1362 add ctr delete --exec-id to debug DeleteProcess
a2e8ab9ff remotes: avoid panic with default resolver conf
7d91d631e Lock `KillAll`.
9639db552 refactor: no need defer in closeAll
e76a8879e fix pipe in broken may cause shim lock forever for runtime v1
b3438f7a6 fix pipe in broken may cause shim lock forever for runtime v2
956e49a36 Revert v2 dropped events
1d4105cac Use named pipes for shim logs
581a63ce4 Add build requirement doc on fedora/centos
01f5aa387 add flag -d for ctr t exec to run a service in container
51ad4d302 change args usage for ctr c create
bd2a21985 fix container cmd args may parsed as ctr args
90880078b Adding a --load-kmods flag to the NVIDIA OCI hook
e1a59ba0f Update runc to 10d38b660a77168360df3522881e2dc2be
8e25ca6bf Revendor github.com/sirupsen/logrus to v1.0.3
0e7a70dbf skip already exists content
6f2f4e434 checkpoint: add copts to checkpoint; save snapshotter to annotation
40caece8d update tests
4fdf720b8 move rw to opt; make snapshot opt; move to NewContainerOpts
147208061 add image name and runtime name media types; remove task operation on checkpoint
ce0673fd7 Restore take image
0e4d9da75 remove task handling from Restore
2d3db08da refactor spec and snapshot restore into opts
45c700a95 refactor checkpoint and restore to client
555ea3fb4 Ignore modprobe failures in ExecStartPre (systemd unit)
abd971cfb Revendor github.com/Microsoft/hcsshim
831a41b95 Fix process locking and state management
c4feaa75c fix: fix failed to get container-shim relation with io.containerd.runc.v1
c524b9ce4 Partially revert the event discard change in #2748.
38d7d59e8 enhance: update v1/v2 runtime
ce6d4c9a9 add docs/rootless.md
dd0539b09 ctr: add --cgroup for oci.WithCgroup
18363d0c9 Add ADOPTERS.md file
354dab0ca Forward ctr.exe --debug as io.containerd.runhcs.v1 options
a33ad4024 Implement io.containerd.runhcs.v1 shim log opts
ec3dbd155 Add io.containerd.runhcs.v1 shim proto options
7d70d2b78 Fix Makefile to run protobuild on paths with spaces
83f4ab885 makefile: remove emoji on Linux
8329a491b Build Windows V1 and V2 runtimes always
124194b98 check task existence before new task
a02f7cea8 bugfix: use skip-verify flag in ctr instead of insecure
2bb7da843 Fix mingw version back to working version with Golang
068880ff1 Add custom headers option to dockerResolver
fa912a79b update link for slack invite
7c85d873a fix typo in ResolverOptions.Credentials documentation
232a06349 Increase reaper buffer size and non-blocking send
00ba92364 bugfix: CloseIO should return correct status code
1cc93460d Bump aufs for unsupported errors
1301813f7 Update ZFS for unsupported warnings
16aaf6c06 Change unsupported snapshot warnings to INFO
07237e34e Bump to Go 1.11.x
c206da795 optimize shim lock in runtime v1
c5a0c7f49 Add build option "GODEBUG=1"
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
4 files changed, 58 insertions, 39 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch index 05c4f153..8b43c8a0 100644 --- a/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch +++ b/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch | |||
| @@ -15,28 +15,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
| 15 | src/import/Makefile | 8 ++++++-- | 15 | src/import/Makefile | 8 ++++++-- |
| 16 | 1 file changed, 6 insertions(+), 2 deletions(-) | 16 | 1 file changed, 6 insertions(+), 2 deletions(-) |
| 17 | 17 | ||
| 18 | diff --git a/src/import/Makefile b/src/import/Makefile | 18 | Index: git/src/import/Makefile |
| 19 | index 4355395..4fb5d3b 100644 | 19 | =================================================================== |
| 20 | --- a/src/import/Makefile | 20 | --- git.orig/src/import/Makefile 2020-10-12 08:09:41.638977052 -0700 |
| 21 | +++ b/src/import/Makefile | 21 | +++ git/src/import/Makefile 2020-10-12 08:10:49.783074373 -0700 |
| 22 | @@ -75,11 +75,15 @@ TEST_REQUIRES_ROOT_PACKAGES=$(filter \ | 22 | @@ -72,6 +72,10 @@ |
| 23 | COMMANDS=ctr containerd containerd-stress | 23 | COMMANDS=ctr containerd containerd-stress |
| 24 | MANPAGES=ctr.1 containerd.1 containerd-config.1 containerd-config.toml.5 | 24 | MANPAGES=ctr.8 containerd.8 containerd-config.8 containerd-config.toml.5 |
| 25 | 25 | ||
| 26 | +ifndef GODEBUG | 26 | +ifndef GODEBUG |
| 27 | + EXTRA_LDFLAGS += -s -w | 27 | + EXTRA_LDFLAGS += -s -w |
| 28 | +endif | 28 | +endif |
| 29 | + | 29 | + |
| 30 | # Build tags seccomp and apparmor are needed by CRI plugin. | 30 | ifdef BUILDTAGS |
| 31 | BUILDTAGS ?= seccomp apparmor | 31 | GO_BUILDTAGS = ${BUILDTAGS} |
| 32 | GO_TAGS=$(if $(BUILDTAGS),-tags "$(BUILDTAGS)",) | 32 | endif |
| 33 | -GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)' | ||
| 34 | -SHIM_GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static"' | ||
| 35 | +GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)' | ||
| 36 | +SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)' | ||
| 37 | |||
| 38 | #Replaces ":" (*nix), ";" (windows) with newline for easy parsing | ||
| 39 | GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n") | ||
| 40 | -- | ||
| 41 | 2.7.4 | ||
| 42 | |||
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 347eae5d..d0ea7153 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | SRCREV = "fd103cb716352c7e19768e4fed057f71d68902a0" | 1 | SRCREV = "e44e8ebeaaa2d605f539dffa3788a53c92458c4d" |
| 2 | SRC_URI = "git://github.com/containerd/containerd;branch=release/1.2 \ | 2 | SRC_URI = "git://github.com/containerd/containerd;branch=release/1.4 \ |
| 3 | file://0001-build-use-oe-provided-GO-and-flags.patch \ | 3 | file://0001-build-use-oe-provided-GO-and-flags.patch \ |
| 4 | file://0001-Add-build-option-GODEBUG-1.patch \ | 4 | file://0001-Add-build-option-GODEBUG-1.patch \ |
| 5 | " | 5 | " |
| @@ -8,7 +8,7 @@ include containerd.inc | |||
| 8 | 8 | ||
| 9 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" | 9 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" |
| 10 | 10 | ||
| 11 | CONTAINERD_VERSION = "v1.2.7" | 11 | CONTAINERD_VERSION = "v1.4.1" |
| 12 | 12 | ||
| 13 | EXTRA_OEMAKE += "GODEBUG=1" | 13 | EXTRA_OEMAKE += "GODEBUG=1" |
| 14 | 14 | ||
diff --git a/recipes-containers/containerd/containerd.inc b/recipes-containers/containerd/containerd.inc index e226edf1..f825e550 100644 --- a/recipes-containers/containerd/containerd.inc +++ b/recipes-containers/containerd/containerd.inc | |||
| @@ -6,7 +6,7 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and | |||
| 6 | 6 | ||
| 7 | # Apache-2.0 for containerd | 7 | # Apache-2.0 for containerd |
| 8 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
| 9 | LIC_FILES_CHKSUM = "file://src/import/LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7" | 9 | LIC_FILES_CHKSUM ?= "file://src/import/LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7" |
| 10 | 10 | ||
| 11 | SRC_URI += "file://containerd.service" | 11 | SRC_URI += "file://containerd.service" |
| 12 | 12 | ||
| @@ -38,7 +38,7 @@ do_compile() { | |||
| 38 | # without this, the stress test parts of the build fail | 38 | # without this, the stress test parts of the build fail |
| 39 | cp ${S}/src/import/*.go ${S}/src/import/vendor/src/github.com/containerd/containerd | 39 | cp ${S}/src/import/*.go ${S}/src/import/vendor/src/github.com/containerd/containerd |
| 40 | 40 | ||
| 41 | for c in content errdefs fs images mount snapshots linux api runtimes defaults progress \ | 41 | for c in content timeout ttrpcutil oom stdio process errdefs fs images mount snapshots linux api runtimes defaults progress \ |
| 42 | protobuf reference diff platforms runtime remotes version archive dialer gc metadata \ | 42 | protobuf reference diff platforms runtime remotes version archive dialer gc metadata \ |
| 43 | metrics filters identifiers labels leases plugin server services \ | 43 | metrics filters identifiers labels leases plugin server services \ |
| 44 | cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp; do | 44 | cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp; do |
| @@ -64,6 +64,7 @@ do_compile() { | |||
| 64 | export BUILDTAGS="no_btrfs static_build netgo" | 64 | export BUILDTAGS="no_btrfs static_build netgo" |
| 65 | export CFLAGS="${CFLAGS}" | 65 | export CFLAGS="${CFLAGS}" |
| 66 | export LDFLAGS="${LDFLAGS}" | 66 | export LDFLAGS="${LDFLAGS}" |
| 67 | export SHIM_CGO_ENABLED=${CGO_ENABLED} | ||
| 67 | 68 | ||
| 68 | cd ${S}/src/import | 69 | cd ${S}/src/import |
| 69 | oe_runmake binaries | 70 | oe_runmake binaries |
diff --git a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch index d4d5973e..a709d125 100644 --- a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch +++ b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch | |||
| @@ -14,29 +14,57 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | |||
| 14 | 14 | ||
| 15 | Index: git/src/import/Makefile | 15 | Index: git/src/import/Makefile |
| 16 | =================================================================== | 16 | =================================================================== |
| 17 | --- git.orig/src/import/Makefile | 17 | --- git.orig/src/import/Makefile 2020-10-12 07:36:18.775820388 -0700 |
| 18 | +++ git/src/import/Makefile | 18 | +++ git/src/import/Makefile 2020-10-12 08:00:05.134151221 -0700 |
| 19 | @@ -166,19 +166,19 @@ | 19 | @@ -163,19 +163,19 @@ |
| 20 | |||
| 21 | build: ## build the go packages | ||
| 22 | @echo "$(WHALE) $@" | ||
| 23 | - @go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} ${EXTRA_FLAGS} ${GO_LDFLAGS} ${PACKAGES} | ||
| 24 | + @$(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} ${EXTRA_FLAGS} ${GO_LDFLAGS} ${PACKAGES} | ||
| 25 | |||
| 26 | test: ## run tests, except integration tests and tests that require root | ||
| 27 | @echo "$(WHALE) $@" | ||
| 28 | - @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}) | ||
| 29 | + @$(GO) test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${PACKAGES}) | ||
| 30 | |||
| 31 | root-test: ## run tests, except integration tests | ||
| 32 | @echo "$(WHALE) $@" | ||
| 33 | - @go test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root | ||
| 34 | + @$(GO) test ${TESTFLAGS} $(filter-out ${INTEGRATION_PACKAGE},${TEST_REQUIRES_ROOT_PACKAGES}) -test.root | ||
| 35 | |||
| 36 | integration: ## run integration tests | ||
| 37 | @echo "$(WHALE) $@" | ||
| 38 | - @go test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL} | ||
| 39 | + @$(GO) test ${TESTFLAGS} -test.root -parallel ${TESTFLAGS_PARALLEL} | ||
| 40 | |||
| 41 | benchmark: ## run benchmarks tests | ||
| 42 | @echo "$(WHALE) $@" | ||
| 43 | @@ -185,7 +185,7 @@ | ||
| 44 | |||
| 45 | define BUILD_BINARY = | ||
| 46 | @echo "$(WHALE) $@" | ||
| 47 | -@go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} ${GO_TAGS} ./$< | ||
| 48 | +@$(GO) build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@ ${GO_LDFLAGS} ${GO_TAGS} ./$< | ||
| 49 | endef | ||
| 50 | |||
| 20 | # Build a binary from a cmd. | 51 | # Build a binary from a cmd. |
| 21 | bin/%: cmd/% FORCE | 52 | @@ -194,15 +194,15 @@ |
| 22 | @echo "$(WHALE) $@${BINARY_SUFFIX}" | ||
| 23 | - @go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< | ||
| 24 | + @$(GO) build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS} ./$< | ||
| 25 | 53 | ||
| 26 | bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 | 54 | bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 |
| 27 | @echo "$(WHALE) bin/containerd-shim" | 55 | @echo "$(WHALE) bin/containerd-shim" |
| 28 | - @CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim | 56 | - @CGO_ENABLED=${SHIM_CGO_ENABLED} go build ${GO_BUILD_FLAGS} -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim |
| 29 | + @$(GO) build ${GO_BUILD_FLAGS} -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim | 57 | + @CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim |
| 30 | 58 | ||
| 31 | bin/containerd-shim-runc-v1: cmd/containerd-shim-runc-v1 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 | 59 | bin/containerd-shim-runc-v1: cmd/containerd-shim-runc-v1 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 |
| 32 | @echo "$(WHALE) bin/containerd-shim-runc-v1" | 60 | @echo "$(WHALE) bin/containerd-shim-runc-v1" |
| 33 | - @CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v1 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v1 | 61 | - @CGO_ENABLED=${SHIM_CGO_ENABLED} go build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v1 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v1 |
| 34 | + @$(GO) build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v1 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v1 | 62 | + @CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v1 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v1 |
| 35 | 63 | ||
| 36 | bin/containerd-shim-runhcs-v1: cmd/containerd-shim-runhcs-v1 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 | 64 | bin/containerd-shim-runc-v2: cmd/containerd-shim-runc-v2 FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 |
| 37 | @echo "$(WHALE) bin/containerd-shim-runhcs-v1${BINARY_SUFFIX}" | 65 | @echo "$(WHALE) bin/containerd-shim-runc-v2" |
| 38 | - @CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runhcs-v1${BINARY_SUFFIX} ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runhcs-v1 | 66 | - @CGO_ENABLED=${SHIM_CGO_ENABLED} go build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v2 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v2 |
| 39 | + @$(GO) build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runhcs-v1${BINARY_SUFFIX} ${SHIM_GO_LDFLAGS} $(GOBUILDFLAGS) ${GO_TAGS} ./cmd/containerd-shim-runhcs-v1 | 67 | + @CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o bin/containerd-shim-runc-v2 ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim-runc-v2 |
| 40 | 68 | ||
| 41 | binaries: $(BINARIES) ## build binaries | 69 | binaries: $(BINARIES) ## build binaries |
| 42 | @echo "$(WHALE) $@" | 70 | @echo "$(WHALE) $@" |