Commit Graph

10081 Commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult
b5f530a157 Makefile: fix DESTDIR environment variable behaviour
The DESTDIR environment variable is used in the wrong way: since 30+ years
it's common practise using it for specifying *temporary* target *root*
(where eg. packaging infrastructure picks up the install image), instead
of the installation *prefix* on the final target.

Fixing this by introducing PREFIX variable (with default /usr/local) and
using both variables according to the 30 years matured common practise.
That way, distro packagers and other standardized build/installation
systems can easily do correct deployments w/o individual hacks.

changes v2: removed variables not used yet
            added documentation

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-06-01 10:49:25 +02:00
zounengren
498bb36f67 scrub the stale TODO
Signed-off-by: zounengren <zouyee1989@gmail.com>
2021-06-01 11:22:15 +08:00
Iceber Gu
93d4541a20 docs/cri: update ocicrypt link
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-05-31 15:32:30 +08:00
Iceber Gu
7924664951 docs/cri: fix broken links
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-05-31 15:31:51 +08:00
Fu Wei
c8b33ba297
Merge pull request #5544 from dmcgowan/update-windows-periodic-tests
Update Windows periodic tests
2021-05-30 11:41:42 +08:00
Derek McGowan
05c03de94d
Update Windows periodic tests
Allow these tests to be manually triggered as well

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-28 10:37:25 -07:00
Derek McGowan
334e74765e
Merge pull request #5165 from adelina-t/azure_ci_workflow
Add CI periodic Windows Jobs.
2021-05-28 08:12:25 -07:00
Fu Wei
c8cbf7998b
Merge pull request #5273 from wzshiming/fix/local-store-atomic-write
Rename atomicWrite to writeToCompletion
2021-05-27 22:36:09 +08:00
Shiming Zhang
9fcea1d3f0 Rename atomicWrite to writeToCompletion
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-05-27 18:07:45 +08:00
Derek McGowan
925ff5a21b
Merge pull request #5539 from alakesh/btrfs-test
Do not run btrfs tests if btrfs kernel module is not loaded
2021-05-26 20:30:31 -07:00
Alakesh Haloi
b996e49c5c Do not run btrfs tests if btrfs kernel module is not loaded
Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-05-26 13:45:56 -07:00
Derek McGowan
f0d2f89437
Merge pull request #5533 from povsister/fix-auth-ua
Fix incorrect UA used for registry authentication
2021-05-26 08:39:25 -07:00
Ethan Chen
50ad4b96c4 Fix incorrect UA used for registry authentication
Previously, containerd uses Go's default UA "Go-http-client/1.1" while authenticating with registry.
This commit changes it to the pattern like "containerd/v1.5.2" which is used for all other requests.

Signed-off-by: Ethan Chen <pov@mahou-shoujo.moe>
2021-05-26 09:45:54 +08:00
Derek McGowan
96df20cf77
Merge pull request #5531 from samuelkarp/freebsd-ctr-run-mounts
ctr: parse mount options with embedded = character
2021-05-25 13:38:54 -07:00
Phil Estes
ba4fa32dca
Merge pull request #5472 from gizahNL/freebsd_mounts
Fix mounts for FreeBSD
2021-05-25 14:11:37 -04:00
Phil Estes
0a92694e0a
Merge pull request #5527 from samuelkarp/freebsd-ctr-exec
ctr: make exec pty behavior consistent with run
2021-05-25 13:24:10 -04:00
Derek McGowan
c0794c06a2
Merge pull request #5534 from oss-qm/submit/makefile-at
Makefile: use $@ for target file names
2021-05-25 10:00:36 -07:00
Enrico Weigelt, metux IT consult
923ab5b7ca Makefile: use $@ for target file names
Make rules can be formulated more generic by using the $@ symbol, instead
of duplicating the target file name.

Just a little cleanup for better maintainability.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-05-25 16:09:23 +02:00
Samuel Karp
535d9cc59f
ctr: parse mount options with embedded = character
FreeBSD mount options may have embedded = characters.  For example,
devfs(5) supports the `ruleset` option which can be passed as
`ruleset=4` to indicate that ruleset 4 should be used.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
2021-05-25 00:21:37 -07:00
Gijs Peskens
a4f97d45da Add ruleset=4 option
Signed-off-by: Gijs Peskens <gijs@peskens.net>
2021-05-25 09:17:16 +02:00
Samuel Karp
5dec27b6f1
ctr: exec handle pty resize after Start
Handle initial pty resize after the exec process has started and the pty
is available, consistent with the behavior of ctr run.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
2021-05-25 00:12:21 -07:00
Derek McGowan
531908c73d
Merge pull request #5528 from MaXinjian/0524
Fix small typo
2021-05-24 09:19:55 -07:00
Ma Xinjian
e1c845df50 Fix small typo
Signed-off-by: Ma Xinjian <maxj.fnst@fujitsu.com>
2021-05-24 11:49:55 +08:00
Samuel Karp
b9378b4529
ctr: exec setup IO with console
Use cio.WithStreams with explicit console device when --tty is passed,
consistent with how ctr run behaves.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
2021-05-22 23:19:46 -07:00
Phil Estes
a0efc54795
Merge pull request #5519 from wzshiming/fix/dont-check-apparmor-parser
Don't check for apparmor_parser to be present
2021-05-20 14:24:07 -04:00
Phil Estes
5089035c5e
Merge pull request #5520 from wzshiming/clean/gen-mgr
Remove useless lines
2021-05-20 08:22:30 -04:00
Shiming Zhang
869375a413 Remove useless lines
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-05-20 16:19:09 +08:00
Shiming Zhang
79e3452213 update the link
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-05-20 11:56:29 +08:00
Shiming Zhang
1acca8bba3 Don't check for apparmor_parser to be present
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
2021-05-20 11:56:29 +08:00
Mike Brown
055c801ede
Merge pull request #5509 from gauravgahlot/typos
Fixed typos in docs
2021-05-19 11:41:43 -05:00
Derek McGowan
dbccd0d357
Merge pull request #5275 from haslersn/fix-4531
Try next mirror in case of non-404 errors, too
2021-05-19 07:57:57 -07:00
Akihiro Suda
88c98fdfef
Merge pull request #5514 from Priyankasaggu11929/psaggu_bump_runc_version_to_v1.0.0-rc95 2021-05-19 22:05:02 +09:00
Priyanka Saggu
ec28288f45
bump runc version to v1.0.0-rc95
Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>
2021-05-19 17:24:56 +05:30
Fu Wei
89de7e7e1c
Merge pull request #5511 from AkihiroSuda/runc-rc95
update runc binary to v1.0.0-rc95
2021-05-19 19:23:28 +08:00
Akihiro Suda
599127f4df
update runc binary to v1.0.0-rc95
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-05-19 19:18:59 +09:00
Akihiro Suda
e9a7b6a7ae
Merge pull request #5508 from dims/bump-go-winio-to-0.5.0
Bump github.com/Microsoft/go-winio from 0.4.15 to 0.5.0
2021-05-19 15:49:01 +09:00
Akihiro Suda
cf7e0002cf
Merge pull request #5507 from dims/bump-selinux-to-1.8.1
Bump github.com/opencontainers/selinux from 1.8.0 to 1.8.1
2021-05-19 15:48:38 +09:00
Gaurav Gahlot
a5b1740bbe fixed typos
Signed-off-by: Gaurav Gahlot <gauravgahlot0107@gmail.com>
2021-05-19 10:31:50 +05:30
Adelina Tuvenie
77285e311c Schedule Windows job daily after midnight.
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-05-18 18:25:09 +03:00
Adelina Tuvenie
2b58782df0 Update windows-periodic.yml
Add 2019 to matrix

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-05-18 18:25:00 +03:00
Davanum Srinivas
5dbae87c59
Bump github.com/Microsoft/go-winio from 0.4.15 to 0.5.0
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-18 11:11:11 -04:00
Davanum Srinivas
1093f05ab2
Bump github.com/opencontainers/selinux from 1.8.0 to 1.8.1
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-18 11:08:04 -04:00
Phil Estes
49321a12df
Merge pull request #5493 from oss-qm/submit/install-prog
Makefile: allow overriding install command via environment
2021-05-18 09:10:29 -04:00
Phil Estes
a152049d7d
Merge pull request #5163 from claudiubelu/test-windows
tests: Adds support for Windows cri-integration tests
2021-05-17 09:24:31 -04:00
Phil Estes
bf1a6678b9
Merge pull request #5504 from dmcgowan/fix-authorization-on-redirect
Update docker resolver to authorize redirects
2021-05-17 08:26:05 -04:00
Phil Estes
bd8ca8f595
Merge pull request #5505 from Priyankasaggu11929/bump-hcsshim-to-v0.8.17
bump hcsshim version to v0.8.17
2021-05-17 08:24:52 -04:00
Priyanka Saggu
b6a2517491
bump hcsshim version to v0.8.17
Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>
2021-05-16 01:38:43 +05:30
Derek McGowan
b1d4140a22
Update docker resolver to authorize redirects
Allows redirects to be authorized if authorization is provided
for the redirected to host. The authorization will always go
to the redirect and never to the referrer.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-05-14 12:16:24 -07:00
Claudiu Belu
09a0c9471b tests: Adds support for Windows cri-integration tests
Currently, the cri-integration tests do not work on Windows due to various reasons.
One of the reasons is because all the tests are using Linux-specific images.
Previous commits refactored the image pulling / usage in the cri-integration tests,
making it easier to update, and easier to configure a custom registry to pull images
with Windows support.

For Windows runs, custom registries can be created, which will also contain Windows
images, and the cri-integration tests can be configured to use those registries by
specifying the "--repo-list" argument, a YAML file which will contain an alternative
mapping of the default registries. This is similar to how E2E tests are handled for
Windows runs in Kubernetes.

Some of the tests are Skipped, as they do not pass yet on Windows.

Windows does not collect inodes used stats, thus, the tests that were expecting non-zero
inodes stats were failing.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-05-14 11:27:35 +00:00
Derek McGowan
fe5d3496a4
Merge pull request #5498 from mikebrow/release-binary-update-for-imgcrypt
Release binary update for imgcrypt
2021-05-13 14:33:43 -07:00