Skip to content

Commit 5a3ccca

Browse files
criylecriyle
committed
linuxcontainer: allow initCmd to be executed to initialize new container
fix #103
1 parent 2ade4b9 commit 5a3ccca

File tree

6 files changed

+58
-26
lines changed

6 files changed

+58
-26
lines changed

‎env/env_linux.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"github.com/criyle/go-sandbox/pkg/forkexec"
1616
"github.com/criyle/go-sandbox/pkg/mount"
1717
ddbus "github.com/godbus/dbus/v5"
18+
"github.com/google/shlex"
1819
"golang.org/x/sys/unix"
1920
)
2021

@@ -90,12 +91,20 @@ func NewBuilder(c Config) (pool.EnvBuilder, map[string]any, error) {
9091
workDir := defaultWorkDir
9192
cUID := containerCred
9293
cGID := containerCred
94+
var initCmd []string
9395
if mc != nil {
9496
hostName = mc.HostName
9597
domainName = mc.DomainName
9698
workDir = mc.WorkDir
9799
cUID = mc.UID
98100
cGID = mc.GID
101+
if mc.InitCmd != "" {
102+
initCmd, err = shlex.Split(mc.InitCmd)
103+
if err != nil {
104+
return nil, nil, fmt.Errorf("failed to parse initCmd: %s %w", mc.InitCmd, err)
105+
}
106+
c.Info("Initialize container with command: ", mc.InitCmd)
107+
}
99108
}
100109
c.Info("Creating container builder: hostName=", hostName, ", domainName=", domainName, ", workDir=", workDir)
101110

@@ -110,6 +119,7 @@ func NewBuilder(c Config) (pool.EnvBuilder, map[string]any, error) {
110119
ExecFile: c.ContainerInitPath,
111120
HostName: hostName,
112121
DomainName: domainName,
122+
InitCommand: initCmd,
113123
WorkDir: workDir,
114124
ContainerUID: cUID,
115125
ContainerGID: cGID,

‎env/mount_linux.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ type Mounts struct {
3131
Mount []Mount `yaml:"mount"`
3232
SymLinks []Link `yaml:"symLink"`
3333
MaskPaths []string `yaml:"maskPath"`
34+
InitCmd string `yaml:"initCmd"`
3435
WorkDir string `yaml:"workDir"`
3536
HostName string `yaml:"hostName"`
3637
DomainName string `yaml:"domainName"`
@@ -124,6 +125,8 @@ var defaultSymLinks = []container.SymbolicLink{
124125
}
125126

126127
var defaultMaskPaths = []string{
128+
"/sys/firmware",
129+
"/sys/devices/virtual/powercap",
127130
"/proc/acpi",
128131
"/proc/asound",
129132
"/proc/kcore",

‎env/noseccomp_linux.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ package env
55
import "syscall"
66

77
func readSeccompConf(name string) ([]syscall.SockFilter, error) {
8+
_ = name
89
return nil, nil
910
}

‎go.mod‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ go 1.22
55
require (
66
github.com/coreos/go-systemd/v22 v22.5.0
77
github.com/creack/pty v1.1.21
8-
github.com/criyle/go-sandbox v0.10.2
8+
github.com/criyle/go-sandbox v0.10.3
99
github.com/elastic/go-seccomp-bpf v1.4.0
1010
github.com/elastic/go-ucfg v0.8.8
1111
github.com/gin-contrib/zap v1.1.1
1212
github.com/gin-gonic/gin v1.9.1
1313
github.com/godbus/dbus/v5 v5.1.0
14+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1415
github.com/gorilla/websocket v1.5.1
1516
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
1617
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
@@ -22,7 +23,7 @@ require (
2223
golang.org/x/sync v0.7.0
2324
golang.org/x/sys v0.19.0
2425
golang.org/x/term v0.19.0
25-
google.golang.org/grpc v1.63.0
26+
google.golang.org/grpc v1.63.2
2627
google.golang.org/protobuf v1.33.0
2728
gopkg.in/yaml.v2 v2.4.0
2829
)
@@ -31,10 +32,10 @@ require (
3132
cloud.google.com/go/compute v1.25.1 // indirect
3233
github.com/BurntSushi/toml v1.3.2 // indirect
3334
github.com/beorn7/perks v1.0.1 // indirect
34-
github.com/bytedance/sonic v1.11.3 // indirect
35+
github.com/bytedance/sonic v1.11.4 // indirect
3536
github.com/cespare/xxhash/v2 v2.3.0 // indirect
36-
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
37-
github.com/chenzhuoyu/iasm v0.9.1 // indirect
37+
github.com/cloudwego/base64x v0.1.0 // indirect
38+
github.com/cloudwego/iasm v0.1.1 // indirect
3839
github.com/fatih/camelcase v1.0.0 // indirect
3940
github.com/fatih/structs v1.1.0 // indirect
4041
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
@@ -50,9 +51,9 @@ require (
5051
github.com/mattn/go-isatty v0.0.20 // indirect
5152
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5253
github.com/modern-go/reflect2 v1.0.2 // indirect
53-
github.com/pelletier/go-toml/v2 v2.2.0 // indirect
54+
github.com/pelletier/go-toml/v2 v2.2.1 // indirect
5455
github.com/prometheus/client_model v0.6.1 // indirect
55-
github.com/prometheus/common v0.52.2 // indirect
56+
github.com/prometheus/common v0.52.3 // indirect
5657
github.com/prometheus/procfs v0.13.0 // indirect
5758
github.com/sirupsen/logrus v1.9.3 // indirect
5859
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
@@ -61,7 +62,7 @@ require (
6162
golang.org/x/arch v0.7.0 // indirect
6263
golang.org/x/crypto v0.22.0 // indirect
6364
golang.org/x/text v0.14.0 // indirect
64-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
6566
gopkg.in/yaml.v3 v3.0.1 // indirect
6667
)
6768

‎go.sum‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,27 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
1212
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
1313
github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
1414
github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
15-
github.com/bytedance/sonic v1.11.3 h1:jRN+yEjakWh8aK5FzrciUHG8OFXK+4/KrAX/ysEtHAA=
16-
github.com/bytedance/sonic v1.11.3/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
15+
github.com/bytedance/sonic v1.11.4 h1:8+OMLSSDDm2/qJc6ld5K5Sm62NK9VHcUKk0NzBoMAM4=
16+
github.com/bytedance/sonic v1.11.4/go.mod h1:YrWEqYtlBPS6LUA0vpuG79a1trsh4Ae41uWUWUreHhE=
1717
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
1818
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
1919
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
2020
github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
2121
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
22-
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
23-
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
2422
github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
25-
github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
26-
github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
2723
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
24+
github.com/cloudwego/base64x v0.1.0 h1:Tg5q9tq1khq9Y9UwfoC6zkHK0FypN2GLDvhqFceOL8U=
25+
github.com/cloudwego/base64x v0.1.0/go.mod h1:lM8nFiNbg74QgesNo6EAtv8N9tlRjBWExmHoNDa3PkU=
26+
github.com/cloudwego/iasm v0.0.9/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
27+
github.com/cloudwego/iasm v0.1.1 h1:Py/XoYVR3xFd2pXmvmOnoS5vHTlYT9SnGK28ES8JOIk=
28+
github.com/cloudwego/iasm v0.1.1/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
2829
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
2930
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
3031
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
3132
github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
3233
github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
33-
github.com/criyle/go-sandbox v0.10.2 h1:K2v9v25VqMvx8FNQST8yY9L2fm0hrzv+9JKQbpxyZ0Y=
34-
github.com/criyle/go-sandbox v0.10.2/go.mod h1:YQHf0ROrwDSyi8nwnXhmk9SfzKLm3oEnq3XzqYMwBos=
34+
github.com/criyle/go-sandbox v0.10.3 h1:xw3BhUBrsQGqrLbWRxERxhMb7qdhmIpS8KdtGgTv3Aw=
35+
github.com/criyle/go-sandbox v0.10.3/go.mod h1:YQHf0ROrwDSyi8nwnXhmk9SfzKLm3oEnq3XzqYMwBos=
3536
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
3637
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3738
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -84,6 +85,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
8485
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
8586
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
8687
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
88+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
89+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
8790
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
8891
github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
8992
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
@@ -119,8 +122,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
119122
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
120123
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
121124
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
122-
github.com/pelletier/go-toml/v2 v2.2.0 h1:QLgLl2yMN7N+ruc31VynXs1vhMZa7CeHHejIeBAsoHo=
123-
github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
125+
github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtosvtEhg=
126+
github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
124127
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
125128
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
126129
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -129,8 +132,8 @@ github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdU
129132
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
130133
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
131134
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
132-
github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck=
133-
github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q=
135+
github.com/prometheus/common v0.52.3 h1:5f8uj6ZwHSscOGNdIQg6OiZv/ybiK2CO2q2drVZAQSA=
136+
github.com/prometheus/common v0.52.3/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
134137
github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
135138
github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
136139
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
@@ -243,15 +246,15 @@ google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJ
243246
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
244247
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
245248
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
246-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4=
247-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
249+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
250+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
248251
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
249252
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
250253
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
251254
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
252255
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
253-
google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8=
254-
google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
256+
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
257+
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
255258
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
256259
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
257260
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎mount.yaml‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ mount:
7171
- type: tmpfs
7272
target: /tmp
7373
data: size=128m,nr_inodes=4k
74+
# MPI wants shm
75+
- type: tmpfs
76+
target: /dev/shm
77+
data: size=64m,nr_inodes=4k
7478
# (optional) bind a /etc/passwd to show customized user name
7579
- type: bind
7680
source: containerPasswd.txt
@@ -80,6 +84,11 @@ mount:
8084
source: dotenv
8185
target: /.env
8286
#readonly: true
87+
# MPI wants /sys, readonly may not work for /sys
88+
- type: bind
89+
source: /sys
90+
target: /sys
91+
# # readonly: true
8392
# java & ghc wants /proc/self/exe
8493
proc: true
8594
# create /dev standard io
@@ -94,6 +103,8 @@ symLink:
94103
target: /proc/self/fd/2
95104
# mask mounted paths with empty / null mount
96105
maskPath:
106+
- /sys/firmware
107+
- /sys/devices/virtual/powercap
97108
- /proc/acpi
98109
- /proc/asound
99110
- /proc/kcore
@@ -108,10 +119,13 @@ maskPath:
108119
# container work directory
109120
workDir: /w
110121
# container host name
111-
hostName: go_judge
122+
hostName: go-judge
112123
# container domain name
113-
domainName: go_judge
124+
domainName: go-judge
114125
# container user uid
115126
uid: 1536
116127
# container user gid
117128
gid: 1536
129+
# init cmd does additional setups
130+
# MPI want network
131+
initCmd: ip link set dev lo up

0 commit comments

Comments
 (0)