Skip to content

Commit 66464fc

Browse files
authored
Merge pull request #103 from AkihiroSuda/dev-nerdctl-0.10.0
2 parents 5b99fc5 + b9d6d6a commit 66464fc

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

.cirrus.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,5 @@ task:
4141
lima_cache:
4242
fingerprint_script: uname -s ; cat examples/$EXAMPLE
4343
folder: /home/testuser/.cache/lima
44+
lima_cache_fix_perm_script: chown -R testuser.testuser /home/testuser
4445
test_script: sudo -iu testuser $(pwd)/hack/test-example.sh $(pwd)/examples/$EXAMPLE

examples/archlinux.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
# This example requires Lima v0.5.0 or later
12
arch: "x86_64"
23
images:
3-
# Hint: run `limactl prune` to invalidate the "LATEST" cache
4-
- location: "https://linuximages.de/openstack/arch/arch-openstack-LATEST-image-bootstrap.qcow2"
4+
- location: "https://gitlab.archlinux.org/archlinux/arch-boxes/-/jobs/27546/artifacts/raw/output/Arch-Linux-x86_64-cloudimg-20210630.27546.qcow2"
55
arch: "x86_64"
66
mounts:
77
- location: "~"

examples/opensuse.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# This example requires Lima v0.5.0 or later
12
images:
2-
- location: https://download.opensuse.org/distribution/leap/15.3/appliances/openSUSE-Leap-15.3-JeOS.x86_64-15.3-OpenStack-Cloud-Build9.108.qcow2
3+
# Hint: run `limactl prune` to invalidate the "Current" cache
4+
- location: https://download.opensuse.org/distribution/leap/15.3/appliances/openSUSE-Leap-15.3-JeOS.x86_64-15.3-OpenStack-Cloud-Current.qcow2
35
arch: "x86_64"
46
# No aarch64 OpenStack build found :(
57
mounts:

hack/test-example.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ set -x
6666
if ! limactl start --tty=false "$FILE"; then
6767
ERROR "Failed to start \"$NAME\""
6868
tail "$HOME/.lima/${NAME}"/*.log
69+
limactl shell "$NAME" systemctl status || true
70+
limactl shell "$NAME" cat /var/log/cloud-init-output.log || true
6971
exit 1
7072
fi
7173

pkg/cidata/cidata.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/sirupsen/logrus"
2121
)
2222

23-
const NerdctlVersion = "0.9.0"
23+
const NerdctlVersion = "0.10.0"
2424

2525
func GenerateISO9660(isoPath, name string, y *limayaml.LimaYAML) error {
2626
if err := limayaml.ValidateRaw(*y); err != nil {

0 commit comments

Comments
 (0)