Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from containerd:main #288

Open
wants to merge 1,984 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
1984 commits
Select commit Hold shift + click to select a range
e2708fb
Fix hosts.toml resolution for docker domain
apostasie Dec 2, 2024
43d3a05
Merge pull request #3715 from apostasie/fix-compose-locking
AkihiroSuda Dec 3, 2024
9b67974
Merge pull request #3718 from apostasie/logs-flaky
AkihiroSuda Dec 3, 2024
6537124
Merge pull request #3716 from apostasie/fix-3691
AkihiroSuda Dec 3, 2024
051b047
Merge pull request #3720 from apostasie/fix-3697
AkihiroSuda Dec 3, 2024
eed4480
Merge pull request #3687 from pendo324/add-no-recreate-to-up
AkihiroSuda Dec 3, 2024
32ab747
Create directory for bypass4netns pid file
apostasie Dec 3, 2024
c0b8f63
Merge pull request #3724 from apostasie/bypass
AkihiroSuda Dec 3, 2024
775a005
gocni -> cni
apostasie Aug 21, 2024
f914ea3
gocontext -> context
apostasie Aug 21, 2024
e536ed5
Increase timeouts on CI
apostasie Dec 4, 2024
9bbf24d
Remove dependency on misplaced helper CreateBuildContext for next-gen…
apostasie Oct 18, 2024
3d944cb
validatePathComponent tests
apostasie Dec 3, 2024
a5ab79c
Merge pull request #3726 from apostasie/ci-fix-timeouts
djdongjin Dec 4, 2024
03f0862
Merge pull request #3728 from apostasie/chore-import-cleanup
AkihiroSuda Dec 4, 2024
1f8fe6a
Merge pull request #3725 from apostasie/fs-tests
djdongjin Dec 4, 2024
b8f4d9c
Cleanup namespace validation
apostasie Dec 3, 2024
d413058
fix: Fix --env-file flag behavior in nerdctl compose
coderbirju Nov 29, 2024
b4ba0cb
build(deps): bump the golang-x group with 6 updates
dependabot[bot] Dec 4, 2024
0c0737d
Merge pull request #3703 from coderbirju/fix-env-file-bug
AkihiroSuda Dec 5, 2024
3206b49
Merge pull request #3732 from containerd/dependabot/go_modules/golang…
AkihiroSuda Dec 5, 2024
ab704e9
Merge pull request #3723 from apostasie/namespace-validate
AkihiroSuda Dec 5, 2024
f3191c4
Merge pull request #3729 from apostasie/more-tests
djdongjin Dec 6, 2024
c2d8b4c
build(deps): bump github.com/cyphar/filepath-securejoin
dependabot[bot] Dec 6, 2024
e3e6c3d
[doc] rootlesskit port driver configuration
fahedouch Dec 7, 2024
84fc734
Merge pull request #3738 from containerd/dependabot/go_modules/github…
AkihiroSuda Dec 8, 2024
e8bca25
build(deps): bump the docker group with 2 updates
dependabot[bot] Dec 9, 2024
f934774
build(deps): bump tonistiigi/xx from 1.5.0 to 1.6.0
dependabot[bot] Dec 9, 2024
17eeb5b
Merge pull request #3743 from containerd/dependabot/docker/tonistiigi…
djdongjin Dec 9, 2024
00f6acd
Merge pull request #3742 from containerd/dependabot/go_modules/docker…
djdongjin Dec 9, 2024
407f5fc
Merge pull request #3740 from fahedouch/improve-rootless-doc
AkihiroSuda Dec 10, 2024
6dac2cf
update BuildKit (0.18.1)
AkihiroSuda Dec 10, 2024
bcc9fa7
update containerd-fuse-overlayfs (2.1.0)
AkihiroSuda Dec 10, 2024
1220ce7
Merge pull request #3746 from AkihiroSuda/dev
AkihiroSuda Dec 10, 2024
9e5a013
build(deps): bump tonistiigi/xx from 1.6.0 to 1.6.1
dependabot[bot] Dec 10, 2024
bd66dc0
build(deps): bump github.com/containerd/go-cni from 1.1.10 to 1.1.11
dependabot[bot] Dec 10, 2024
e3b231e
3432: Support --pull flag in nerdctl compose up
manugupt1 Dec 11, 2024
5736ded
Merge pull request #3750 from containerd/dependabot/go_modules/github…
AkihiroSuda Dec 11, 2024
bf01328
Merge pull request #3749 from containerd/dependabot/docker/tonistiigi…
AkihiroSuda Dec 11, 2024
1185e8e
docs: add faq tips for buildkit cache folder
miurahr Dec 8, 2024
5dfc39e
build(deps): bump golang.org/x/crypto in the golang-x group
dependabot[bot] Dec 11, 2024
8aa7169
build(deps): bump github.com/containerd/nydus-snapshotter
dependabot[bot] Dec 11, 2024
db82f09
build(deps): bump github.com/compose-spec/compose-go/v2
dependabot[bot] Dec 11, 2024
79e4f17
Merge pull request #3752 from containerd/dependabot/go_modules/golang…
AkihiroSuda Dec 11, 2024
cc9a3fc
Merge pull request #3753 from containerd/dependabot/go_modules/github…
AkihiroSuda Dec 11, 2024
580d47c
Merge pull request #3745 from manugupt1/docker-compose-up-pull
AkihiroSuda Dec 11, 2024
444c172
Merge pull request #3741 from miurahr/topic/miurahr/docs/nerdctl-buil…
AkihiroSuda Dec 11, 2024
e30a362
Rewrite cp
apostasie Dec 4, 2024
47d6d0a
cp integration tests
apostasie Dec 4, 2024
6f55896
Merge pull request #3754 from containerd/dependabot/go_modules/github…
djdongjin Dec 12, 2024
a252d35
build(deps): bump the stargz group with 3 updates
dependabot[bot] Dec 12, 2024
fd217a0
Merge pull request #3758 from containerd/dependabot/go_modules/stargz…
ktock Dec 13, 2024
db52916
Switch github actions to commit sha
apostasie Dec 7, 2024
6e913a6
Remove spurious cache true, default for action/go
apostasie Dec 7, 2024
7e97f06
Merge pull request #3739 from apostasie/ci-cleanup
AkihiroSuda Dec 14, 2024
7a69f5d
When the port is 443, also save credentials without port
apostasie Dec 16, 2024
2ae8ca7
build(deps): bump github.com/containerd/containerd/v2
dependabot[bot] Dec 16, 2024
ad49550
build(deps): bump github.com/containerd/imgcrypt/v2
dependabot[bot] Dec 16, 2024
2d79e10
build(deps): bump golangci/golangci-lint-action
dependabot[bot] Dec 16, 2024
98e939c
build(deps): bump docker/setup-buildx-action from 3.7.1 to 3.8.0
dependabot[bot] Dec 16, 2024
6ee9a83
Merge pull request #3770 from containerd/dependabot/github_actions/do…
djdongjin Dec 17, 2024
d062b17
Merge pull request #3767 from containerd/dependabot/go_modules/github…
djdongjin Dec 17, 2024
337154c
Merge pull request #3768 from containerd/dependabot/go_modules/github…
djdongjin Dec 17, 2024
0e5f7fd
Merge pull request #3769 from containerd/dependabot/github_actions/go…
djdongjin Dec 17, 2024
ef02692
update containerd (2.0.1), runc (1.2.3), buildKit (0.18.2), stargz-sn…
yankay Dec 17, 2024
98ea42d
build(deps): bump github.com/cyphar/filepath-securejoin
dependabot[bot] Dec 17, 2024
8972500
Merge pull request #3774 from yankay/update-deps
AkihiroSuda Dec 18, 2024
c894bb4
Merge pull request #3775 from containerd/dependabot/go_modules/github…
AkihiroSuda Dec 18, 2024
49bf063
Fix wrong commit sha for golangci action
apostasie Dec 18, 2024
b777a65
build(deps): bump the docker group with 2 updates
dependabot[bot] Dec 18, 2024
dab134f
Merge pull request #3777 from apostasie/fix-3769
AkihiroSuda Dec 19, 2024
c41b394
Merge pull request #3779 from containerd/dependabot/go_modules/docker…
AkihiroSuda Dec 19, 2024
25e4f3f
build(deps): bump golang.org/x/net in the golang-x group
dependabot[bot] Dec 19, 2024
8b5bb67
build(deps): bump github.com/containerd/cgroups/v3 from 3.0.4 to 3.0.5
dependabot[bot] Dec 19, 2024
3dbd24c
fix pull image process output from stderr to stdout
yankay Dec 17, 2024
b26474b
doc:add some doc for ulimit
ningmingxiao Dec 19, 2024
c5b57fa
Merge pull request #3773 from yankay/fix-pull-image-process-to-stderr2
AkihiroSuda Dec 20, 2024
5fbd493
Merge pull request #3782 from containerd/dependabot/go_modules/github…
AkihiroSuda Dec 20, 2024
35213f3
Merge pull request #3778 from containerd/dependabot/go_modules/golang…
AkihiroSuda Dec 20, 2024
f3f8310
Add nerdctl build --add-host option support
austinvazquez Dec 23, 2024
8ed777d
Merge pull request #3786 from austinvazquez/feat-build-add-host
AkihiroSuda Dec 24, 2024
3cf6903
Merge pull request #3780 from ningmingxiao/add_ulimit_doc
AkihiroSuda Dec 24, 2024
eaa8df0
Fix duplicate image entries in k8s.io namespaces
fengwei0328 Dec 10, 2024
75c8066
update:fix update pids-limit=0 error
ningmingxiao Dec 19, 2024
6f34536
Merge pull request #3323 from apostasie/b-dev-cp
AkihiroSuda Dec 25, 2024
aa5eb28
Fix image inspect exit code on image not found error
austinvazquez Dec 27, 2024
f917e5c
Merge pull request #3792 from austinvazquez/fix-inspect-err-dnf
djdongjin Dec 29, 2024
842be9a
Refactor: Encapsulate net opts loading in internalLabels
motinsa Dec 29, 2024
d6248ac
Refactor: Change function loadNetOpts from public to private
motinsa Jan 2, 2025
1a79790
build(deps): bump github.com/moby/term from 0.5.0 to 0.5.2
dependabot[bot] Jan 3, 2025
df40602
Merge pull request #3781 from ningmingxiao/fix_update
AkihiroSuda Jan 5, 2025
84fbcf8
Merge pull request #3744 from fengwei0328/dev1
AkihiroSuda Jan 5, 2025
e6132a7
Merge pull request #3794 from containerd/dependabot/go_modules/github…
djdongjin Jan 5, 2025
b0e78ee
update CNI plugins (1.6.2)
djdongjin Jan 7, 2025
1b98a5e
Merge pull request #3797 from djdongjin/cni-1-6-2
djdongjin Jan 7, 2025
8a1fd9e
build(deps): bump the golang-x group with 4 updates
dependabot[bot] Jan 7, 2025
fa3a4fa
update runc (1.2.4)
austinvazquez Jan 7, 2025
9ffc5c1
Merge pull request #3766 from apostasie/fix-3748
AkihiroSuda Jan 7, 2025
9ef9539
remove old cni 1.6.1 checksum file
djdongjin Jan 7, 2025
40b17cd
Merge pull request #3800 from djdongjin/remove-cni-1-6-1-checksum
AkihiroSuda Jan 7, 2025
bcf15a1
Merge pull request #3799 from austinvazquez/update-runc-v1.2.4
AkihiroSuda Jan 7, 2025
0184c43
Merge pull request #3795 from containerd/dependabot/go_modules/golang…
AkihiroSuda Jan 7, 2025
25ca668
build(deps): bump github.com/compose-spec/compose-go/v2
dependabot[bot] Jan 7, 2025
f5e58de
Merge pull request #3801 from containerd/dependabot/go_modules/github…
djdongjin Jan 8, 2025
690bbbf
build(deps): bump docker/setup-qemu-action from 3.2.0 to 3.3.0
dependabot[bot] Jan 8, 2025
6ea7306
build(deps): bump docker/build-push-action from 6.10.0 to 6.11.0
dependabot[bot] Jan 8, 2025
751b33b
Merge pull request #3793 from motinsa/main
fahedouch Jan 10, 2025
3961f26
Merge pull request #3803 from containerd/dependabot/github_actions/do…
fahedouch Jan 10, 2025
ae7a300
Merge pull request #3802 from containerd/dependabot/github_actions/do…
fahedouch Jan 10, 2025
74e00af
bump up github.com/containerd/go-cni to 1.1.12
djdongjin Jan 11, 2025
50dd735
move vagrant CI to ubuntu 24.04
djdongjin Jan 11, 2025
b854127
Merge pull request #3810 from djdongjin/bump-up-go-cni
AkihiroSuda Jan 12, 2025
2ce9918
docs: Fix incorrect parameter description in documentation of nydus
Jan 13, 2025
6ab1907
Update containerd (1.7.25) in CI
austinvazquez Jan 10, 2025
5844e84
build(deps): bump github.com/cyphar/filepath-securejoin
dependabot[bot] Jan 13, 2025
dfea78c
build(deps): bump github.com/containerd/platforms
dependabot[bot] Jan 13, 2025
b17b2cc
Merge pull request #3811 from BraveY/docs-nydus
djdongjin Jan 14, 2025
1003083
Merge pull request #3807 from austinvazquez/update-containerd-1.7.25-…
djdongjin Jan 14, 2025
aea28bf
Merge pull request #3814 from containerd/dependabot/go_modules/github…
djdongjin Jan 14, 2025
251c56d
build(deps): bump the docker group with 2 updates
dependabot[bot] Jan 14, 2025
ab3bdf4
Merge pull request #3815 from containerd/dependabot/go_modules/github…
AkihiroSuda Jan 14, 2025
4be793b
Merge pull request #3813 from containerd/dependabot/go_modules/docker…
AkihiroSuda Jan 14, 2025
70bed8d
build(deps): bump github.com/containerd/containerd/v2
dependabot[bot] Jan 14, 2025
1259a55
Merge pull request #3817 from containerd/dependabot/go_modules/github…
djdongjin Jan 14, 2025
e3d2710
test: refactor TestRunWithInvalidPortThenCleanUp
haytok Jan 15, 2025
7bfbd31
fix: Add the logic to clean up an orphaned etchosts directory
haytok Jan 15, 2025
fcb900e
test: Add an test for added logic to TestRunWithInvalidPortThenCleanUp
haytok Jan 15, 2025
7a4c252
build(deps): bump docker/build-push-action from 6.11.0 to 6.12.0
dependabot[bot] Jan 15, 2025
ef26ad8
reset spec if update returned error
zzzzzzzzzy9 Jan 14, 2025
ae9894e
build(deps): bump golangci/golangci-lint-action from 6.1.1 to 6.2.0
dependabot[bot] Jan 16, 2025
f15d0ad
Merge pull request #3819 from haytok/fix-to-clean-up-an-orphaned-etch…
AkihiroSuda Jan 17, 2025
5a669b8
Merge pull request #3823 from containerd/dependabot/github_actions/go…
AkihiroSuda Jan 17, 2025
9a6426d
fix: save multiple images for the same image id to a tar archive
haytok Jan 16, 2025
ab027ad
Correct `compose logs` command reference
rerpha Jan 17, 2025
5fdd049
Merge pull request #3824 from rerpha/patch-1
AkihiroSuda Jan 17, 2025
128e6a7
[doc] AppArmor profile setup for rootlesskit
fahedouch Jan 15, 2025
9a1d57b
Merge pull request #3820 from fahedouch/reflect-apparmor-restrict-unp…
AkihiroSuda Jan 19, 2025
343a122
Merge pull request #3821 from containerd/dependabot/github_actions/do…
fahedouch Jan 19, 2025
b792f1f
Merge pull request #3822 from haytok/nerdctl_issue_3806
fahedouch Jan 19, 2025
2eeb8de
Merge pull request #3818 from zzzzzzzzzy9/update
AkihiroSuda Jan 20, 2025
08206c8
build(deps): bump github.com/rootless-containers/rootlesskit/v2
dependabot[bot] Jan 20, 2025
587ae99
Merge pull request #3825 from containerd/dependabot/go_modules/github…
AkihiroSuda Jan 21, 2025
8af25af
update containerd (2.0.2)
AkihiroSuda Jan 21, 2025
f17df13
update Kubo (0.32.1)
AkihiroSuda Jan 21, 2025
d786133
update RootlessKit (2.3.2)
AkihiroSuda Jan 21, 2025
00e21f7
update bypass4netns (0.4.2)
AkihiroSuda Jan 21, 2025
e7e27f6
update containerd-fuse-overlayfs (2.1.1)
AkihiroSuda Jan 21, 2025
cb7fc0d
update BuildKit (0.19.0)
AkihiroSuda Jan 21, 2025
ce61fc4
Merge pull request #3826 from AkihiroSuda/dev
ktock Jan 21, 2025
a4fa4fa
integration test: specify IPFS_PATH for IPFS service
ktock Jan 21, 2025
8b92434
Merge pull request #3828 from ktock/carry-3827
AkihiroSuda Jan 21, 2025
84caccf
build(deps): bump actions/setup-go from 5.2.0 to 5.3.0
dependabot[bot] Jan 21, 2025
af3bb99
build(deps): bump github.com/rootless-containers/bypass4netns
dependabot[bot] Jan 21, 2025
558dd93
Merge pull request #3830 from containerd/dependabot/go_modules/github…
AkihiroSuda Jan 22, 2025
8a0c16c
build(deps): bump the docker group with 2 updates
dependabot[bot] Jan 22, 2025
26c0322
build(deps): bump github.com/ipfs/go-cid from 0.4.1 to 0.5.0
dependabot[bot] Jan 22, 2025
1e83a48
Merge pull request #3833 from containerd/dependabot/go_modules/docker…
djdongjin Jan 23, 2025
fc59620
Merge pull request #3834 from containerd/dependabot/go_modules/github…
djdongjin Jan 23, 2025
300a705
Merge pull request #3829 from containerd/dependabot/github_actions/ac…
djdongjin Jan 23, 2025
ec6a6ab
Relax error on annotations read failure
apostasie Dec 16, 2024
a6fe6c1
Fix wrong error comparison
apostasie Jan 24, 2025
7352033
Skip TestRunBindMountPropagation
apostasie Jan 24, 2025
99bd772
Fix test time to use UTC
apostasie Jan 24, 2025
fe59974
build(deps): bump docker/build-push-action from 6.12.0 to 6.13.0
dependabot[bot] Jan 24, 2025
7c9d25a
Disable systemd test on arm64
apostasie Jan 24, 2025
10e4cda
Test portability fix: ensure tini-custom is here
apostasie Jan 24, 2025
7f433aa
Fix socket address not being updated properly
apostasie Jan 25, 2025
d88bed4
Merge pull request #3844 from containerd/dependabot/github_actions/do…
fahedouch Jan 25, 2025
6e5e943
fix: prevent panic in nydus snapshotter inspect
SpiffyEight77 Jan 23, 2025
3382194
Merge pull request #3847 from apostasie/ci-fix-tini-custom
fahedouch Jan 26, 2025
1e8f43b
Merge pull request #3835 from SpiffyEight77/fix/issue-3755
fahedouch Jan 26, 2025
c890dd6
Merge pull request #3842 from apostasie/ci-utc-fix
AkihiroSuda Jan 27, 2025
01c15a7
Merge pull request #3771 from apostasie/fix-3765
AkihiroSuda Jan 27, 2025
f8e47e8
Merge pull request #3836 from apostasie/fix-idiot
AkihiroSuda Jan 27, 2025
17bbdff
Consistently use %w instead of %s or %v when wrapping errors
apostasie Jan 22, 2025
2a75093
Consistently use WithError when logging errors instead of %s
apostasie Jan 22, 2025
a178c29
Merge pull request #3849 from apostasie/fix-3848
djdongjin Jan 27, 2025
82791bf
fix journald logger exit and wait behavior
apostasie Jan 24, 2025
653c6de
test: Add a test for container access with 127.0.0.2 specified in -p …
haytok Jan 28, 2025
c69f816
Merge pull request #3831 from haytok/nerdctl_issue_3539
djdongjin Jan 28, 2025
528b852
Merge pull request #3846 from apostasie/fix-broken-systemd-test
fahedouch Jan 28, 2025
7565ceb
build(deps): bump github.com/cyphar/filepath-securejoin
dependabot[bot] Jan 28, 2025
bf46306
Merge pull request #3855 from containerd/dependabot/go_modules/github…
AkihiroSuda Jan 29, 2025
67a1088
Merge pull request #3832 from apostasie/fix-3765-follow-up
AkihiroSuda Jan 29, 2025
e5a7bc3
Merge pull request #3841 from apostasie/fix-3840
AkihiroSuda Jan 29, 2025
89214a4
Merge pull request #3837 from apostasie/ci-3404
AkihiroSuda Jan 29, 2025
8a80469
Harden journald test
apostasie Jan 24, 2025
2b07c18
build(deps): bump github.com/spf13/pflag from 1.0.5 to 1.0.6
dependabot[bot] Jan 29, 2025
8ef14b7
Merge pull request #3857 from containerd/dependabot/go_modules/github…
djdongjin Jan 31, 2025
3863614
Prevent reference filter from failing on dangling images
apostasie Jan 27, 2025
2ecc394
Fix apparmor test not running
apostasie Jan 31, 2025
0f9f062
Merge pull request #3853 from apostasie/fix-3852
fahedouch Feb 3, 2025
a457d9c
Merge pull request #3860 from apostasie/fix-3859
fahedouch Feb 3, 2025
fd0bcbe
build(deps): bump the golang-x group with 4 updates
dependabot[bot] Feb 4, 2025
5e36bef
build(deps): bump golangci/golangci-lint-action from 6.2.0 to 6.3.0
dependabot[bot] Feb 4, 2025
b59828a
Merge pull request #3843 from apostasie/fix-3839
AkihiroSuda Feb 4, 2025
4a8d993
Merge pull request #3863 from containerd/dependabot/go_modules/golang…
AkihiroSuda Feb 4, 2025
21590cd
Merge pull request #3864 from containerd/dependabot/github_actions/go…
djdongjin Feb 5, 2025
c4a795f
build(deps): bump docker/setup-buildx-action from 3.8.0 to 3.9.0
dependabot[bot] Feb 6, 2025
cf95ae0
Reduce file permissions
fengwei0328 Feb 6, 2025
c6666e3
fix nerdctl-full SHA256SUMS fails
yankay Feb 7, 2025
73a4b01
Merge pull request #3865 from fengwei0328/permission
AkihiroSuda Feb 7, 2025
9fcd7ee
Merge pull request #3870 from yankay/fix-nerdctl-full-SHA256SUMS
AkihiroSuda Feb 7, 2025
0f17259
build(deps): bump golang.org/x/crypto in the golang-x group
dependabot[bot] Feb 7, 2025
0bf2b22
Merge pull request #3871 from containerd/dependabot/go_modules/golang…
djdongjin Feb 8, 2025
d5c26ef
Merge pull request #3869 from containerd/dependabot/github_actions/do…
djdongjin Feb 8, 2025
402bd2a
build(deps): bump docker/setup-qemu-action from 3.3.0 to 3.4.0
dependabot[bot] Feb 8, 2025
cb915f6
Merge pull request #3868 from containerd/dependabot/github_actions/do…
AkihiroSuda Feb 9, 2025
d64ab5a
enable host name and default resolv.conf and hosts file in none network
Shubhranshu153 Sep 20, 2024
a6086d1
build(deps): bump golangci/golangci-lint-action from 6.3.0 to 6.3.2
dependabot[bot] Feb 10, 2025
3f7b70f
build(deps): bump golang.org/x/net in the golang-x group
dependabot[bot] Feb 10, 2025
3680b00
build(deps): bump gotest.tools/v3 from 3.5.1 to 3.5.2
dependabot[bot] Feb 10, 2025
4722dd6
build(deps): bump github.com/compose-spec/compose-go/v2
dependabot[bot] Feb 10, 2025
04c3508
Merge pull request #3875 from containerd/dependabot/go_modules/github…
djdongjin Feb 10, 2025
60c2356
Merge pull request #3874 from containerd/dependabot/go_modules/gotest…
djdongjin Feb 10, 2025
4051b78
Merge pull request #3872 from containerd/dependabot/github_actions/go…
djdongjin Feb 10, 2025
8e9e464
Merge pull request #3873 from containerd/dependabot/go_modules/golang…
djdongjin Feb 11, 2025
4e111d3
docs(nerdctl-compose): add missing details in command-reference.md
subashkotha Feb 12, 2025
974bc84
fix: network cleanup called twice
Shubhranshu153 Feb 13, 2025
94c271e
update runc (1.2.5)
austinvazquez Feb 14, 2025
8675cc6
build(deps): bump golangci/golangci-lint-action from 6.3.2 to 6.4.1
dependabot[bot] Feb 14, 2025
105e5eb
Remove require daemon version for >=1.6
apostasie Feb 15, 2025
3f496b8
Cleanup old/unused helpers
apostasie Feb 15, 2025
1995b11
Merge pull request #3879 from subashkotha/update-nerdctl-compose-readme
AkihiroSuda Feb 15, 2025
0e6c2e9
Merge pull request #3886 from containerd/dependabot/github_actions/go…
AkihiroSuda Feb 15, 2025
0b7d119
Merge pull request #3887 from apostasie/ci-minor-cleanup
AkihiroSuda Feb 15, 2025
369e7e7
Merge pull request #3880 from Shubhranshu153/fix-network-cleanup
AkihiroSuda Feb 15, 2025
8bd8699
Merge pull request #3443 from Shubhranshu153/fix-network-none
AkihiroSuda Feb 15, 2025
5ffcba6
Fix FATA error when inspecting images in native mode
weiyuhang2011 Feb 15, 2025
a1a2ec2
Merge pull request #3884 from austinvazquez/update-nerdctl-1.2.5
djdongjin Feb 15, 2025
893a393
feat: add support for 'domainname' option in container create
swagatbora90 Feb 14, 2025
99210b6
add signal option to container stop command
coderbirju Feb 17, 2025
67ecd67
Merge pull request #3888 from weiyuhang2011/fix-3876
fahedouch Feb 17, 2025
31a7ab8
build(deps): bump golangci/golangci-lint-action from 6.4.1 to 6.5.0
dependabot[bot] Feb 17, 2025
b45d96d
build(deps): bump github.com/spf13/cobra from 1.8.1 to 1.9.1
dependabot[bot] Feb 17, 2025
1370ef8
Merge pull request #3893 from containerd/dependabot/github_actions/go…
djdongjin Feb 17, 2025
fd53b80
Merge pull request #3894 from containerd/dependabot/go_modules/github…
djdongjin Feb 17, 2025
87cc074
Merge pull request #3885 from swagatbora90/add-domainname-option
AkihiroSuda Feb 18, 2025
d3f5d10
add tests
coderbirju Feb 17, 2025
89003a5
Merge pull request #3892 from coderbirju/add-signal-container-stop
djdongjin Feb 18, 2025
3eb9a96
build(deps): bump actions/cache from 4.2.0 to 4.2.1
dependabot[bot] Feb 19, 2025
a0f1236
build(deps): bump github.com/klauspost/compress from 1.17.11 to 1.18.0
dependabot[bot] Feb 19, 2025
4e0688b
build(deps): bump github.com/containerd/accelerated-container-image
dependabot[bot] Feb 19, 2025
26c7b26
Merge pull request #3901 from containerd/dependabot/go_modules/github…
AkihiroSuda Feb 20, 2025
c169499
Support bind propagation options in Compose volume long syntax
dancavallaro Feb 18, 2025
c7b9f56
Merge pull request #3902 from containerd/dependabot/go_modules/github…
AkihiroSuda Feb 20, 2025
856bb40
Merge pull request #3899 from containerd/dependabot/github_actions/ac…
AkihiroSuda Feb 20, 2025
8bef361
docs: add --log-driver=none to run command reference
trinidadgithub Feb 20, 2025
98f3846
Merge pull request #3905 from trinidadgithub/docs/add-log-driver-none
AkihiroSuda Feb 20, 2025
2215dc5
Merge pull request #3903 from dancavallaro/dancavallaro/propagation
fahedouch Feb 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkg/logging/json_logger.go
Original file line number Diff line number Diff line change
@@ -88,10 +88,11 @@ func (jsonLogger *JSONLogger) PreProcess(dataStore string, config *logging.Confi
l := &logrotate.Logger{
Filename: jsonFilePath,
}
//maxSize Defaults to unlimited.
var capVal int64
capVal = -1
// MaxBytes is the maximum size in bytes of the log file before it gets
// rotated. If not set, it defaults to 100 MiB.
// see: https://github.com/fahedouch/go-logrotate/blob/6a8beddaea39b2b9c77109d7fa2fe92053c063e5/logrotate.go#L500
if capacity, ok := jsonLogger.Opts[MaxSize]; ok {
var capVal int64
var err error
capVal, err = units.FromHumanSize(capacity)
if err != nil {
@@ -100,8 +101,8 @@ func (jsonLogger *JSONLogger) PreProcess(dataStore string, config *logging.Confi
if capVal <= 0 {
return fmt.Errorf("max-size must be a positive number")
}
l.MaxBytes = capVal
}
l.MaxBytes = capVal
maxFile := 1
if maxFileString, ok := jsonLogger.Opts[MaxFile]; ok {
var err error