Skip to content

Commit 1e67e5d

Browse files
aledbfroboquat
authored andcommitted
[docker-up] Set same MTU than ceth0
1 parent 26a8f3f commit 1e67e5d

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

components/docker-up/BUILD.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ packages:
4040
- ["rm", "-r", "components-docker-up--bin-docker-up"]
4141
- ["mv", "components-docker-up--bin-runc-facade/docker-up", "runc-facade"]
4242
- ["rm", "-r", "components-docker-up--bin-runc-facade"]
43-
# Override docker-compose with custom version https://github.com/aledbf/compose/pull/1
44-
- ["curl", "-sSL", "https://github.com/aledbf/compose/releases/download/v2.4.1.1-gitpod/docker-compose-linux-x86_64", "-o", "docker-compose"]
43+
# Override docker-compose with custom version https://github.com/gitpod-io/compose/pull/1
44+
- ["curl", "-sSL", "https://github.com/aledbf/compose/releases/download/v2.4.1.2-gitpod/docker-compose-linux-x86_64", "-o", "docker-compose"]
4545
- ["chmod", "+x", "docker-compose"]
4646
- name: docker
4747
type: docker

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
sigproxysignal "github.com/rootless-containers/rootlesskit/pkg/sigproxy/signal"
3030
"github.com/sirupsen/logrus"
3131
"github.com/spf13/pflag"
32+
"github.com/vishvananda/netlink"
3233
"golang.org/x/sys/unix"
3334
"golang.org/x/xerrors"
3435
)
@@ -122,6 +123,14 @@ func runWithinNetns() (err error) {
122123
}
123124
args = append(args, userArgs...)
124125

126+
containerIf := "ceth0"
127+
netIface, err := netlink.LinkByName(containerIf)
128+
if err != nil {
129+
return xerrors.Errorf("cannot get container network device %s: %w", containerIf, err)
130+
}
131+
132+
args = append(args, fmt.Sprintf("--mtu=%v", netIface.Attrs().MTU))
133+
125134
if listenFDs > 0 {
126135
os.Setenv("LISTEN_PID", strconv.Itoa(os.Getpid()))
127136
args = append(args, "-H", "fd://")

0 commit comments

Comments
 (0)