Skip to content

bake: honor single-value ulimits from compose #4112

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.

Sign up for GitHub

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

Open
breken-ai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bake: honor single-value ulimits from compose #4112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion bake/compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,12 @@ func ParseCompose(cfgs []composetypes.ConfigFile, envs map[string]string) (*Conf
var ulimits []string
if s.Build.Ulimits != nil {
for n, u := range s.Build.Ulimits {
ulimit, err := units.ParseUlimit(fmt.Sprintf("%s=%d:%d", n, u.Soft, u.Hard))
soft, hard := u.Soft, u.Hard
if u.Single != 0 {
// short syntax (e.g. "nproc: 65535") sets both limits
soft, hard = u.Single, u.Single
}
ulimit, err := units.ParseUlimit(fmt.Sprintf("%s=%d:%d", n, soft, hard))
if err != nil {
return nil, err
}
Expand Down
19 changes: 19 additions & 0 deletions bake/compose_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,25 @@ services:
require.Equal(t, []string{"nofile=1024:1024"}, c.Targets[1].Ulimits)
}

func TestComposeUlimitsSingleValue(t *testing.T) {
dt := []byte(`
services:
app:
build:
context: .
ulimits:
nproc: 65535
nofile:
soft: 20000
hard: 40000
`)

c, err := ParseCompose([]composetypes.ConfigFile{{Content: dt}}, nil)
require.NoError(t, err)
require.Len(t, c.Targets, 1)
require.ElementsMatch(t, []string{"nproc=65535:65535", "nofile=20000:40000"}, c.Targets[0].Ulimits)
}

func TestComposeExtDedup(t *testing.T) {
dt := []byte(`
services:
Expand Down
Loading