Skip to content

Commit ea15dbf

Browse files
Cody RoseboroughIRCody
Cody Roseborough
authored andcommitted
Update to go1.13
- Add go1.13 as a build target for travis. - Set the go version in go.mod at 1.11. - Update a line in go.mod that wasn't compliant with the more stringent validation in 1.13. - Update Dockerfiles to use 1.13. Signed-off-by: Cody Roseborough <[email protected]>
1 parent abbf94f commit ea15dbf

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

.travis.yml

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

44
go:
5+
- 1.13.x
56
- 1.12.x
67
- 1.11.x
78

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
1919
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
2020
github.com/docker/go-units v0.3.3
21-
github.com/firecracker-microvm/firecracker-go-sdk v0.17.1-0.20191030150325-dbf9a1e05f090
21+
github.com/firecracker-microvm/firecracker-go-sdk v0.17.1-0.20191029213755-dbf9a1e05f09
2222
github.com/go-ole/go-ole v1.2.4 // indirect
2323
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384 // indirect
2424
github.com/gofrs/uuid v3.2.0+incompatible
@@ -53,3 +53,5 @@ require (
5353

5454
// Workaround for github.com/containerd/containerd issue #3031
5555
replace github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
56+
57+
go 1.11

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 h1:X0fj836zx99zF
5959
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
6060
github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk=
6161
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
62-
github.com/firecracker-microvm/firecracker-go-sdk v0.17.1-0.20191030150325-dbf9a1e05f090 h1:xxS6hBxzXh/EEahnfwXBLxIIDtDAfLJrA5OmsQQ/lNI=
63-
github.com/firecracker-microvm/firecracker-go-sdk v0.17.1-0.20191030150325-dbf9a1e05f090/go.mod h1:tVXziw7GjioCKVjI5/agymYxUaqJM6q7cp9e6kwjo8Q=
62+
github.com/firecracker-microvm/firecracker-go-sdk v0.17.1-0.20191029213755-dbf9a1e05f09 h1:JDfRpK+V2J1Es+Xm6aMJjCqvA4xv1kuWnJfeSopyDwo=
63+
github.com/firecracker-microvm/firecracker-go-sdk v0.17.1-0.20191029213755-dbf9a1e05f09/go.mod h1:tVXziw7GjioCKVjI5/agymYxUaqJM6q7cp9e6kwjo8Q=
6464
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb h1:D4uzjWwKYQ5XnAvUbuvHW93esHg7F8N/OYeBBcJoTr0=
6565
github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
6666
github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=

tools/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# COMMON IMAGES
1818
#
1919
#########################################
20-
FROM golang:1.12-stretch as base
20+
FROM golang:1.13-stretch as base
2121
# Set up a non-root user for running builds and some tests in later stages
2222
# Buildkit caches don't support anything like a "--chown" flag yet, so we need to ensure builder will have access to them
2323
RUN useradd --create-home --uid 1001 builder \

tools/docker/Dockerfile.proto-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# express or implied. See the License for the specific language governing
1212
# permissions and limitations under the License.
1313

14-
FROM golang:1.12-stretch
14+
FROM golang:1.13-stretch
1515

1616
RUN apt-get update && apt-get install --yes --no-install-recommends \
1717
libprotobuf-dev \

tools/docker/Dockerfile.runc-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# express or implied. See the License for the specific language governing
1212
# permissions and limitations under the License.
1313

14-
FROM golang:1.12-stretch
14+
FROM golang:1.13-stretch
1515

1616
RUN apt-get update && \
1717
DEBIAN_FRONTEND=noninteractive apt-get -y install libseccomp-dev pkg-config

0 commit comments

Comments
 (0)