Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
build: fix make proto error
Browse files Browse the repository at this point in the history
Fixes #335
1. Correct the way to obtain "arch"
2. Install protoc-gen-gogofast

Signed-off-by: Zichang Lin <[email protected]>
  • Loading branch information
linzichang committed Aug 28, 2018
1 parent 46396d2 commit 74a5364
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN yum makecache && yum install -y \

# install GO development environment
ENV GO_VERSION 1.9.2
RUN curl -fkL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-$(arch).tar.gz \
RUN curl -fkL https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${arch}.tar.gz \
| tar -zxC /usr/local/
ENV GOPATH /go
ENV PATH $PATH:/go/bin:/usr/local/go/bin
Expand All @@ -41,9 +41,9 @@ RUN go get -d github.com/golang/protobuf/protoc-gen-go \

# install gogo/protobuf
ENV GOGO_COMMIT 41168f6614b7bb144818ec8967b8c702705df564
RUN go get -d -v github.com/gogo/protobuf/{proto,jsonpb,protoc-gen-gogo,gogoproto}
RUN go get -d -v github.com/gogo/protobuf/{proto,jsonpb,protoc-gen-gogo,gogoproto,protoc-gen-gogofast}
RUN cd $GOPATH/src/github.com/gogo/protobuf && git checkout -q ${GOGO_COMMIT} \
&& go install github.com/gogo/protobuf/{proto,jsonpb,protoc-gen-gogo,gogoproto}
&& go install github.com/gogo/protobuf/{proto,jsonpb,protoc-gen-gogo,gogoproto,protoc-gen-gogofast}

# add agent repository
ADD . ${GOPATH}/src/github.com/kata-containers/agent
Expand Down

0 comments on commit 74a5364

Please sign in to comment.