Skip to content

Commit afedbc7

Browse files
authored
Merge pull request #406 from kzys/sdk-upgrade
Upgrade Firecracker Go SDK to v0.21.0
2 parents 7383119 + 85ba62b commit afedbc7

File tree

6 files changed

+140
-38
lines changed

6 files changed

+140
-38
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
strategy:
1919
matrix:
20-
go: ['1.11', '1.12', '1.13', '1.14']
20+
go: ['1.13', '1.14']
2121
# Build all variants regardless of failures
2222
fail-fast: false
2323
name: Go ${{ matrix.go }}

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ dist: xenial
22
language: go
33

44
go:
5+
- 1.14.x
56
- 1.13.x
6-
- 1.12.x
7-
- 1.11.x
87

98
env:
109
- GO111MODULE=on

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ You need to have the following things in order to use firecracker-containerd:
4242
[described here](https://github.com/firecracker-microvm/firecracker/blob/master/docs/getting-started.md#running-firecracker)
4343
as `hello-rootfs.ext4`).
4444
* A recent installation of [Docker CE](https://docker.com).
45-
* Go 1.11 or later, which you can download from [here](https://golang.org/dl/).
45+
* Go 1.13 or later, which you can download from [here](https://golang.org/dl/).
4646

4747
## Setup
4848

docs/quickstart.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ files into `/usr/local/bin`.
2828

2929
cd ~
3030

31-
# Install git, Go 1.11, make, curl
31+
# Install git, Go 1.13, make, curl
3232
sudo mkdir -p /etc/apt/sources.list.d
33+
echo "deb http://ftp.debian.org/debian buster-backports main" | \
34+
sudo tee /etc/apt/sources.list.d/buster-backports.list
3335
sudo DEBIAN_FRONTEND=noninteractive apt-get update
3436
sudo DEBIAN_FRONTEND=noninteractive apt-get \
3537
install --yes \
36-
golang-go \
38+
golang-1.13 \
3739
make \
3840
git \
3941
curl \
@@ -42,6 +44,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get \
4244
bc \
4345
gnupg
4446

47+
# Debian's Go 1.13 package installs "go" command under /usr/lib/go-1.13/bin
48+
export PATH=/usr/lib/go-1.13/bin:$PATH
49+
4550
cd ~
4651

4752
# Install Docker CE

go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ require (
77
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d // indirect
88
github.com/containerd/containerd v1.3.3
99
github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac // indirect
10-
github.com/containerd/fifo v0.0.0-20190816180239-bda0ff6ed73c
10+
github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00
1111
github.com/containerd/go-runc v0.0.0-20190226155025-7d11b49dc076
1212
github.com/containerd/ttrpc v0.0.0-20190613183316-1fb3814edf44
1313
github.com/containerd/typeurl v0.0.0-20181015155603-461401dc8f19
1414
github.com/containernetworking/cni v0.7.2-0.20190807151350-8c6c47d1c7fc
15-
github.com/containernetworking/plugins v0.8.2
15+
github.com/containernetworking/plugins v0.8.5
1616
github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
1717
github.com/docker/distribution v2.7.1+incompatible // indirect
1818
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
1919
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
20-
github.com/firecracker-microvm/firecracker-go-sdk v0.20.1-0.20200204230548-c56932849923
20+
github.com/firecracker-microvm/firecracker-go-sdk v0.21.0
2121
github.com/go-ole/go-ole v1.2.4 // indirect
2222
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384 // indirect
2323
github.com/gofrs/uuid v3.2.0+incompatible
@@ -33,18 +33,18 @@ require (
3333
github.com/opencontainers/image-spec v1.0.1 // indirect
3434
github.com/opencontainers/runc v1.0.0-rc9
3535
github.com/opencontainers/runtime-spec v0.1.2-0.20181106065543-31e0d16c1cb7
36-
github.com/pkg/errors v0.8.1
36+
github.com/pkg/errors v0.9.1
3737
github.com/prometheus/client_golang v0.9.2 // indirect
3838
github.com/shirou/gopsutil v2.18.12+incompatible
3939
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
40-
github.com/sirupsen/logrus v1.4.1
41-
github.com/stretchr/testify v1.3.0
40+
github.com/sirupsen/logrus v1.4.2
41+
github.com/stretchr/testify v1.5.1
4242
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
4343
github.com/urfave/cli v1.20.0 // indirect
44-
github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf
44+
github.com/vishvananda/netlink v1.1.0
4545
go.etcd.io/bbolt v1.3.1-etcd.8 // indirect
46-
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
47-
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e
46+
golang.org/x/sync v0.0.0-20190423024810-112230192c58
47+
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449
4848
google.golang.org/genproto v0.0.0-20181109154231-b5d43981345b // indirect
4949
google.golang.org/grpc v1.21.0
5050
gotest.tools v2.2.0+incompatible // indirect

0 commit comments

Comments
 (0)