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

Commit

Permalink
builder updates
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Oswalt <[email protected]>
  • Loading branch information
Mierdin committed Dec 14, 2020
1 parent 38651e5 commit e2b17a2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
9 changes: 5 additions & 4 deletions Dockerfile-antidotebuilder
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM golang:1.10 as build-env
FROM golang:1.15 as build-env

# Install additional dependencies
RUN apt-get update \
&& apt-get install -y git curl unzip jq file zip
&& apt-get install -y git curl unzip jq file zip make


RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.11.4/protoc-3.11.4-linux-x86_64.zip && unzip protoc-3.11.4-linux-x86_64.zip -d protoc3 && chmod +x protoc3/bin/* && mv protoc3/bin/* /usr/local/bin && mv protoc3/include/* /usr/local/include/
RUN curl -L https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v1.14.3/protoc-gen-grpc-gateway-v1.14.3-linux-x86_64 -o $GOPATH/bin/protoc-gen-grpc-gateway && chmod +x $GOPATH/bin/protoc-gen-grpc-gateway
RUN curl -L https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v1.14.3/protoc-gen-swagger-v1.14.3-linux-x86_64 -o $GOPATH/bin/protoc-gen-swagger && chmod +x $GOPATH/bin/protoc-gen-swagger
RUN curl -L https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v1.14.5/protoc-gen-grpc-gateway-v1.14.3-linux-x86_64 -o $GOPATH/bin/protoc-gen-grpc-gateway && chmod +x $GOPATH/bin/protoc-gen-grpc-gateway
RUN curl -L https://github.com/grpc-ecosystem/grpc-gateway/releases/download/v1.14.5/protoc-gen-swagger-v1.14.3-linux-x86_64 -o $GOPATH/bin/protoc-gen-swagger && chmod +x $GOPATH/bin/protoc-gen-swagger

RUN go get -u github.com/golang/protobuf/protoc-gen-go
RUN go get github.com/jteeuwen/go-bindata/...
Expand Down
2 changes: 1 addition & 1 deletion hack/compile-binaries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e
RELEASE_VERSION=$1

# Make sure things compile and pass tests
cd $GOPATH/src/github.com/nre-learning/antidote-core
cd $GOPATH/src/github.com/nre-learning/antidote-core && go mod download && make install_bins
make

if [ $? -ne 0 ]; then
Expand Down

0 comments on commit e2b17a2

Please sign in to comment.