Skip to content

Commit 4ad0b81

Browse files
aledbfroboquat
authored andcommitted
Add clone3 to seccomp profile syscalls
1 parent 95892c6 commit 4ad0b81

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

components/docker-up/dependencies.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
set -euo pipefail
77

8-
DOCKER_VERSION=19.03.15
9-
DOCKER_COMPOSE_VERSION=1.29.2
10-
RUNC_VERSION=v1.1.0
8+
DOCKER_VERSION=20.10.17
9+
DOCKER_COMPOSE_VERSION=2.8.0-gitpod.0
10+
RUNC_VERSION=v1.1.3
1111

1212
curl -o docker.tgz -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz
13-
curl -o docker-compose -fsSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64
13+
curl -o docker-compose -fsSL https://github.com/gitpod-io/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64
1414
curl -o runc -fsSL https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.amd64

components/docker-up/docker-up/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ func needInstallRunc() bool {
468468
return true
469469
}
470470

471-
return major < 1 || major == 1 && minor < 1
471+
return major < 1 || major == 1 && minor < 3
472472
}
473473

474474
func detectRuncVersion(output string) (major, minor int, err error) {

components/docker-up/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.18
44

55
require (
66
github.com/gitpod-io/gitpod/common-go v0.0.0-00010101000000-000000000000
7-
github.com/opencontainers/runtime-spec v1.0.2
7+
github.com/opencontainers/runtime-spec v1.0.3-0.20220601164019-72c1f0b44f79
88
github.com/rootless-containers/rootlesskit v1.0.1
99
github.com/sirupsen/logrus v1.9.0
1010
github.com/spf13/pflag v1.0.5

components/docker-up/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
2424
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
2525
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2626
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
27-
github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0=
28-
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
27+
github.com/opencontainers/runtime-spec v1.0.3-0.20220601164019-72c1f0b44f79 h1:JeJNHMISqkHIT50baRp6X+m6ZCd7QVpP5cW9ReVxjQk=
28+
github.com/opencontainers/runtime-spec v1.0.3-0.20220601164019-72c1f0b44f79/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
2929
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3030
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3131
github.com/rootless-containers/rootlesskit v1.0.1 h1:jepqW1txFSowKSMAEkVhWH3Oa1TCY9S400MVYe/6Iro=

components/ws-daemon/seccomp-profile-installer/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func main() {
3131
specs.LinuxSyscall{
3232
Names: []string{
3333
"clone",
34+
"clone3",
3435
"mount",
3536
"umount2",
3637
"chroot",

0 commit comments

Comments
 (0)