Skip to content

Commit d32757b

Browse files
Merge pull request #1711 from dqminh/update-build-dep
Update build dependencies in Dockerfile
2 parents 757e78b + 8be3162 commit d32757b

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ go:
33
- 1.7.x
44
- 1.8.x
55
- 1.9.x
6+
- 1.10.x
67
- tip
78

89
matrix:

Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
FROM golang:1.8
2-
3-
# libseccomp in jessie is not _quite_ new enough -- need backports version
4-
RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list
1+
FROM golang:1.10-stretch
52

63
RUN apt-get update && apt-get install -y \
74
build-essential \
@@ -17,8 +14,8 @@ RUN apt-get update && apt-get install -y \
1714
libprotobuf-c0-dev \
1815
libnl-3-dev \
1916
libnet-dev \
20-
libseccomp2/jessie-backports \
21-
libseccomp-dev/jessie-backports \
17+
libseccomp2 \
18+
libseccomp-dev \
2219
protobuf-c-compiler \
2320
protobuf-compiler \
2421
python-minimal \
@@ -41,9 +38,9 @@ RUN cd /tmp \
4138
&& rm -rf /tmp/bats
4239

4340
# install criu
44-
ENV CRIU_VERSION 3ca8e575b49763030d3ddfec4af190a4c9f9deef
41+
ENV CRIU_VERSION v3.7
4542
RUN mkdir -p /usr/src/criu \
46-
&& curl -sSL https://github.com/xemul/criu/archive/${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \
43+
&& curl -sSL https://github.com/checkpoint-restore/criu/archive/${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \
4744
&& cd /usr/src/criu \
4845
&& make install-criu \
4946
&& rm -rf /usr/src/criu

0 commit comments

Comments
 (0)