Skip to content

Commit 3c25750

Browse files
authored
Merge pull request #560 from kzys/go-upgrade
Upgrade Go from 1.13 to 1.15
2 parents bc1cb8f + fa7b59b commit 3c25750

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ SUBMODULES=_submodules
2828
UID:=$(shell id -u)
2929
GID:=$(shell id -g)
3030

31-
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.13-buster
31+
FIRECRACKER_CONTAINERD_BUILDER_IMAGE?=golang:1.15-buster
3232
export FIRECRACKER_CONTAINERD_TEST_IMAGE?=localhost/firecracker-containerd-test
3333
export GO_CACHE_VOLUME_NAME?=gocache
3434

tools/docker/Dockerfile.integ-test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:experimental
22
# Test image that starts up containerd and the devmapper snapshotter. The default CMD will drop to a bash shell. Overrides
33
# to CMD will be provided appended to /bin/bash -c
4-
FROM golang:1.13-stretch
4+
FROM golang:1.15-stretch
55
ENV PATH="/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/go/bin"
66
ENV INSTALLROOT="/usr/local"
77
ENV DEBIAN_FRONTEND="noninteractive"

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.13-stretch
14+
FROM golang:1.15-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.13-stretch
14+
FROM golang:1.15-stretch
1515

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

0 commit comments

Comments
 (0)