Merge pull request #1711 from dqminh/update-build-dep

Update build dependencies in Dockerfile
This commit is contained in:
Michael Crosby 2018-02-27 11:41:04 -05:00 committed by GitHub
commit d32757b0cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions

View File

@ -3,6 +3,7 @@ go:
- 1.7.x
- 1.8.x
- 1.9.x
- 1.10.x
- tip
matrix:

View File

@ -1,7 +1,4 @@
FROM golang:1.8
# libseccomp in jessie is not _quite_ new enough -- need backports version
RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
FROM golang:1.10-stretch
RUN apt-get update && apt-get install -y \
build-essential \
@ -17,8 +14,8 @@ RUN apt-get update && apt-get install -y \
libprotobuf-c0-dev \
libnl-3-dev \
libnet-dev \
libseccomp2/jessie-backports \
libseccomp-dev/jessie-backports \
libseccomp2 \
libseccomp-dev \
protobuf-c-compiler \
protobuf-compiler \
python-minimal \
@ -41,9 +38,9 @@ RUN cd /tmp \
&& rm -rf /tmp/bats
# install criu
ENV CRIU_VERSION 3ca8e575b49763030d3ddfec4af190a4c9f9deef
ENV CRIU_VERSION v3.7
RUN mkdir -p /usr/src/criu \
&& curl -sSL https://github.com/xemul/criu/archive/${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \
&& curl -sSL https://github.com/checkpoint-restore/criu/archive/${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \
&& cd /usr/src/criu \
&& make install-criu \
&& rm -rf /usr/src/criu