From 7354a7f00178583c662224b0ae9fe68055d760d4 Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Tue, 14 Nov 2017 15:10:23 -0800 Subject: [PATCH] README, travis: update protobuf compiler version Signed-off-by: Stephen J Day --- .travis.yml | 10 +++++++--- README.md | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38611b677..8351057aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ addons: - libnl-3-dev - libnet-dev - protobuf-c-compiler - - protobuf-compiler + # - protobuf-compiler - python-minimal - libcap-dev - libaio-dev @@ -35,8 +35,12 @@ before_install: - uname -r install: - - wget https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip -O /tmp/protoc-3.3.0-linux-x86_64.zip - - sudo unzip -o -d /usr/local /tmp/protoc-3.3.0-linux-x86_64.zip + - wget https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip -O /tmp/protoc-3.5.0-linux-x86_64.zip + - sudo unzip -o -d /usr/local /tmp/protoc-3.5.0-linux-x86_64.zip + - sudo chmod +x /usr/local/bin/protoc + - sudo chmod og+rx /usr/local/include/google /usr/local/include/google/protobuf /usr/local/include/google/protobuf/compiler + - sudo chmod -R og+r /usr/local/include/google/protobuf/ + - protoc --version - go get -u github.com/vbatts/git-validation - sudo wget https://github.com/crosbymichael/runc/releases/download/ctd-7/runc -O /bin/runc; sudo chmod +x /bin/runc - wget https://github.com/xemul/criu/archive/v3.0.tar.gz -O /tmp/criu.tar.gz diff --git a/README.md b/README.md index 3832446b2..d846e2bcb 100644 --- a/README.md +++ b/README.md @@ -161,8 +161,8 @@ To build the daemon and `ctr` simple test client, the following build system dep For proper results, install the `protoc` release into `/usr/local` on your build system. For example, the following commands will download and install the 3.1.0 release for a 64-bit Linux host: ``` -$ wget -c https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip -$ sudo unzip protoc-3.1.0-linux-x86_64.zip -d /usr/local +$ wget -c https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip +$ sudo unzip protoc-3.5.0-linux-x86_64.zip -d /usr/local ``` With the required dependencies installed, the `Makefile` target named **binaries** will compile the `ctr` and `containerd` binaries and place them in the `bin/` directory. Using `sudo make install` will place the binaries in `/usr/local/bin`. When making any changes to the gRPC API, `make generate` will use the installed `protoc` compiler to regenerate the API generated code packages.