Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

With firebuild, you can build and deploy secure VMs directly from `Dockerfiles` and Docker images in just few minutes.

The concept of `firebuild` is to leverage as much of the existing Docker world as possible. There are thousands of Docker images out there. Docker images are awesome because they encapsulate the software we want to run in our workloads, they also encapsulate dependencies. Dockerfiles are what Docker images are built from. Dockeriles are the blueprints of the modern infrastructure. There are thousands of them for almost anything one can imagine and new ones are very easy to write.
The concept of `firebuild` is to leverage as much of the existing Docker world as possible. There are thousands of Docker images out there. Docker images are awesome because they encapsulate the software we want to run in our workloads, they also encapsulate dependencies. Dockerfiles are what Docker images are built from. Dockerfiles are the blueprints of the modern infrastructure. There are thousands of them for almost anything one can imagine and new ones are very easy to write.

With firebuild it is possible to:

Expand Down
2 changes: 1 addition & 1 deletion cmd/baseos/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func processCommand() int {

spanRootfsMkfs.Finish()

rootLogger.Info("EXT4 file system created, mouting", "path", rootFSFile, "size-mb", commandConfig.FSSizeMBs)
rootLogger.Info("EXT4 file system created, mounting", "path", rootFSFile, "size-mb", commandConfig.FSSizeMBs)

spanMountRootfs := tracer.StartSpan("baseos-mount-rootfs", opentracing.ChildOf(spanRootfsMkfs.Context()))

Expand Down
4 changes: 2 additions & 2 deletions cmd/rootfs/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ func processCommand() int {

vmmLogger := rootLogger.With("vmm-id", jailingFcConfig.VMMID(), "veth-name", vethIfaceName)

vmmLogger.Info("buildiing VMM",
vmmLogger.Info("building VMM",
"dockerfile", commandConfig.Dockerfile,
"kernel-path", resolvedKernel.HostPath(),
"source-rootfs", machineConfig.RootfsOverride(),
Expand All @@ -562,7 +562,7 @@ func processCommand() int {
span.Finish()
})

strategy := configs.DefaultFirectackerStrategy(machineConfig).
strategy := configs.DefaultFirecrackerStrategy(machineConfig).
AddRequirements(func() *arbitrary.HandlerPlacement {
// add this one after the previous one so by he logic,
// this one will be placed and executed before the first one
Expand Down
2 changes: 1 addition & 1 deletion cmd/run/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func processCommand(args []string) int {
Type: metadata.MetadataTypeRun,
}

vmmStrategy := configs.DefaultFirectackerStrategy(machineConfig).
vmmStrategy := configs.DefaultFirecrackerStrategy(machineConfig).
AddRequirements(func() *arbitrary.HandlerPlacement {
// add this one after the previous one so by he logic,
// this one will be placed and executed before the first one
Expand Down
6 changes: 3 additions & 3 deletions configs/firecracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
// DefaultVethIfaceName is the default veth interface name.
const DefaultVethIfaceName = "veth0"

// DefaultFirectackerStrategy returns an instance of the default Firecracker Jailer strategy for a given machine config.
func DefaultFirectackerStrategy(machineConfig *MachineConfig) arbitrary.PlacingStrategy {
// DefaultFirecrackerStrategy returns an instance of the default Firecracker Jailer strategy for a given machine config.
func DefaultFirecrackerStrategy(machineConfig *MachineConfig) arbitrary.PlacingStrategy {
return arbitrary.NewStrategy(func() *arbitrary.HandlerPlacement {
return arbitrary.NewHandlerPlacement(firecracker.
LinkFilesHandler(filepath.Base(machineConfig.KernelOverride())),
Expand Down Expand Up @@ -101,7 +101,7 @@ func (c *defaultFcConfigProvider) ToSDKConfig() firecracker.Config {
Daemonize: c.machineConfig.Daemonize(),
ChrootStrategy: func() firecracker.HandlersAdapter {
if c.fcStrategy == nil {
return DefaultFirectackerStrategy(c.machineConfig)
return DefaultFirecrackerStrategy(c.machineConfig)
}
return c.fcStrategy
}(),
Expand Down
6 changes: 3 additions & 3 deletions pkg/metadata/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func (r *MDRun) AsMMDS() (interface{}, error) {
return nil, errors.Wrap(err, "failed fetching public keys")
}

entrypoitInfo := &mmds.MMDSRootfsEntrypointInfo{
entrypointInfo := &mmds.MMDSRootfsEntrypointInfo{
Cmd: r.Rootfs.EntrypointInfo.Cmd,
Entrypoint: r.Rootfs.EntrypointInfo.Entrypoint,
Env: r.Rootfs.EntrypointInfo.Env,
Expand All @@ -153,10 +153,10 @@ func (r *MDRun) AsMMDS() (interface{}, error) {
Workdir: r.Rootfs.EntrypointInfo.Workdir,
}
if len(r.Configs.RunConfig.CapturedCmd()) > 0 {
entrypoitInfo.Cmd = r.Configs.RunConfig.CapturedCmd()
entrypointInfo.Cmd = r.Configs.RunConfig.CapturedCmd()
}

entrypointJSON, err := entrypoitInfo.ToJsonString()
entrypointJSON, err := entrypointInfo.ToJsonString()
if err != nil {
return nil, errors.Wrap(err, "failed fetching public keys")
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/vmm/vmm.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func NewDefaultProvider(cniConfig *configs.CNIConfig, jailingFcConfig *configs.J
jailingFcConfig: jailingFcConfig,
machineConfig: machineConfig,

handlersAdapter: configs.DefaultFirectackerStrategy(machineConfig),
handlersAdapter: configs.DefaultFirecrackerStrategy(machineConfig),
logger: hclog.Default(),
vethIfaceName: configs.DefaultVethIfaceName,
}
Expand Down