File tree 6 files changed +3
-14
lines changed
6 files changed +3
-14
lines changed Original file line number Diff line number Diff line change @@ -212,10 +212,6 @@ configuration file has the following fields:
212
212
` firecracker ` located in its working directory. A fully-qualified path to the
213
213
` firecracker ` binary is recommended, as the working directory typically
214
214
changes every execution when run by containerd.
215
- * ` socket_path ` (required) - A path where a socket file should be created for
216
- communicating with the Firecracker API. A relative path like
217
- ` ./firecracker.sock ` is recommended so that the socket is created in the
218
- temporary working directory allocated by containerd.
219
215
* ` kernel_image_path ` (required) - A path where the kernel image file is
220
216
located. A fully-qualified path is recommended.
221
217
* ` kernel_args ` (required) - Arguments for the kernel command line.
@@ -241,7 +237,6 @@ configuration file has the following fields:
241
237
``` json
242
238
{
243
239
"firecracker_binary_path" : " /usr/local/bin/firecracker" ,
244
- "socket_path" : " ./firecracker.sock" ,
245
240
"kernel_image_path" : " /var/lib/firecracker-containerd/runtime/hello-vmlinux.bin" ,
246
241
"kernel_args" : " console=ttyS0 noapic reboot=k panic=1 pci=off nomodules rw" ,
247
242
"root_drive" : " /var/lib/firecracker-containerd/runtime/hello-rootfs.ext4" ,
Original file line number Diff line number Diff line change @@ -138,7 +138,6 @@ sudo mkdir -p /etc/containerd
138
138
sudo tee -a /etc/containerd/firecracker-runtime.json << EOF
139
139
{
140
140
"firecracker_binary_path": "/usr/local/bin/firecracker",
141
- "socket_path": "./firecracker.sock",
142
141
"kernel_image_path": "/var/lib/firecracker-containerd/runtime/hello-vmlinux.bin",
143
142
"kernel_args": "console=ttyS0 noapic reboot=k panic=1 pci=off nomodules rw",
144
143
"root_drive": "/var/lib/firecracker-containerd/runtime/hello-rootfs.ext4",
Original file line number Diff line number Diff line change @@ -38,10 +38,6 @@ configuration file has the following fields:
38
38
` firecracker ` located in its working directory. A fully-qualified path to the
39
39
` firecracker ` binary is recommended, as the working directory typically
40
40
changes every execution when run by containerd.
41
- * ` socket_path ` (required) - A path where a socket file should be created for
42
- communicating with the Firecracker API. A relative path like
43
- ` ./firecracker.sock ` is recommended so that the socket is created in the
44
- temporary working directory allocated by containerd.
45
41
* ` kernel_image_path ` (required) - A path where the kernel image file is
46
42
located. A fully-qualified path is recommended.
47
43
* ` kernel_args ` (required) - Arguments for the kernel command line.
Original file line number Diff line number Diff line change @@ -24,12 +24,12 @@ import (
24
24
const (
25
25
configPathEnvName = "FIRECRACKER_CONTAINERD_RUNTIME_CONFIG_PATH"
26
26
defaultConfigPath = "/etc/containerd/firecracker-runtime.json"
27
+ defaultSocketPath = "./firecracker.sock"
27
28
)
28
29
29
30
// Config represents runtime configuration parameters
30
31
type Config struct {
31
32
FirecrackerBinaryPath string `json:"firecracker_binary_path"`
32
- SocketPath string `json:"socket_path"`
33
33
KernelImagePath string `json:"kernel_image_path"`
34
34
KernelArgs string `json:"kernel_args"`
35
35
RootDrive string `json:"root_drive"`
Original file line number Diff line number Diff line change 1
1
{
2
2
"firecracker_binary_path" : " ./firecracker" ,
3
- "socket_path" : " ./firecracker.sock" ,
4
3
"kernel_image_path" : " vmlinux" ,
5
4
"kernel_args" : " console=ttyS0 noapic reboot=k panic=1 pci=off nomodules rw" ,
6
5
"root_drive" : " ./vsock.img" ,
Original file line number Diff line number Diff line change @@ -637,7 +637,7 @@ func (s *service) startVM(ctx context.Context,
637
637
}
638
638
639
639
cfg := firecracker.Config {
640
- SocketPath : s . config . SocketPath ,
640
+ SocketPath : defaultSocketPath ,
641
641
VsockDevices : []firecracker.VsockDevice {{Path : "root" , CID : cid }},
642
642
KernelImagePath : s .config .KernelImagePath ,
643
643
KernelArgs : s .config .KernelArgs ,
@@ -673,7 +673,7 @@ func (s *service) startVM(ctx context.Context,
673
673
cfg .Drives = driveBuilder .Build ()
674
674
cmd := firecracker.VMCommandBuilder {}.
675
675
WithBin (s .config .FirecrackerBinaryPath ).
676
- WithSocketPath (s . config . SocketPath ).
676
+ WithSocketPath (defaultSocketPath ).
677
677
Build (ctx )
678
678
machineOpts := []firecracker.Opt {
679
679
firecracker .WithProcessRunner (cmd ),
You can’t perform that action at this time.
0 commit comments