Skip to content

Commit

Permalink
removing nerdctl archive in VM
Browse files Browse the repository at this point in the history
Signed-off-by: Channing Gaddy <[email protected]>
  • Loading branch information
CodeChanning committed Aug 9, 2023
1 parent f49625f commit 3d32a8e
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,15 @@ An example `finch.yaml` looks like this:
cpus: 4
# memory: the amount of memory to dedicate to the virtual machine. (required)
memory: 4GiB
# snapshotter: the snapshotter a user want to use as there default snapshotter
# Supported Snapshotters List:
# - soci https://github.com/awslabs/soci-snapshotter/tree/main
# Once the option has been set the snapshotter will be installed on either finch vm init or finch vm start.
# The snapshotter binary will be downloaded on the virtual machine and will be configured and ready for use.
# To change your default snpahotter back to overlayfs, simply remove the snapshotter value from finch.yaml
# To completely remove the snapshotter binary, shell into your VM and remove /usr/local/bin/{snapshotter binary}
# and remove the snapshotter configuration in the containerd config file found at /etc/containerd/config.toml
snapshotter: soci
# creds_helpers: a list of credential helpers that will be installed and configured automatically.
# Supported Credential Helpers List:
# - ecr-login https://github.com/awslabs/amazon-ecr-credential-helper
Expand Down
9 changes: 4 additions & 5 deletions finch.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,10 @@ containerd:
user: false
# # Override containerd archive
# # 🟢 Builtin default: hard-coded URL with hard-coded digest (see the output of `limactl info | jq .defaultTemplate.containerd.archives`)
# adding archive for nerdctl 1.5.0 just for e2e testing
archives:
- location: "https://github.com/containerd/nerdctl/releases/download/v1.5.0/nerdctl-full-1.5.0-linux-arm64.tar.gz"
arch: "aarch64"
digest: "sha256:32a2537e0a80e1493b5934ca56c3e237466606a1b720aef23b9c0a7fc3303bdb"
# archives:
# - location: "~/Downloads/nerdctl-full-X.Y.Z-linux-amd64.tar.gz"
# arch: "x86_64"
# digest: "sha256:..."

# Provisioning scripts need to be idempotent because they might be called
# multiple times, e.g. when the host VM is being restarted.
Expand Down
6 changes: 3 additions & 3 deletions pkg/config/lima_config_applier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fi
want: nil,
},
{
name: "adds soci script when soci is set to true in config",
name: "adds soci script when snapshotter is set to soci in config",
config: &Finch{
Memory: pointer.String("2GiB"),
CPUs: pointer.Int(4),
Expand Down Expand Up @@ -150,13 +150,13 @@ fi
want: nil,
},
{
name: "doesn't add soci script when soci is set to false in config",
name: "doesn't add soci script when snapshotter is not set in config",
config: &Finch{
Memory: pointer.String("2GiB"),
CPUs: pointer.Int(4),
VMType: pointer.String("qemu"),
Rosetta: pointer.Bool(false),
Snapshotter: pointer.String("string"),
Snapshotter: pointer.String(""),
},
path: "/lima.yaml",
isInit: true,
Expand Down

0 comments on commit 3d32a8e

Please sign in to comment.