From b9f12f65e6532e18688578ad8963d5202cca8fea Mon Sep 17 00:00:00 2001 From: Ray Milkey Date: Thu, 3 Mar 2022 16:53:24 -0800 Subject: [PATCH] Build an image with the 2.0.0b4 version of betterproto --- VERSION | 2 +- build/protoc-go/Dockerfile | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index d666bd4..6d7de6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2-dev +1.0.2 diff --git a/build/protoc-go/Dockerfile b/build/protoc-go/Dockerfile index 36e63fc..7fd2d87 100644 --- a/build/protoc-go/Dockerfile +++ b/build/protoc-go/Dockerfile @@ -3,12 +3,13 @@ FROM golang:1.16 RUN apt-get update && \ apt-get install -y unzip python3 python3-pip -RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.17.1/protoc-3.17.1-linux-x86_64.zip && \ - unzip -o protoc-3.17.1-linux-x86_64.zip -d /usr/local bin/protoc && \ - unzip -o protoc-3.17.1-linux-x86_64.zip -d /usr/local include/* && \ - rm -rf protoc-3.17.1-linux-x86_64.zip +RUN curl -OL https://github.com/protocolbuffers/protobuf/releases/download/v3.19.4/protoc-3.19.4-linux-x86_64.zip && \ + unzip -o protoc-3.19.4-linux-x86_64.zip -d /usr/local bin/protoc && \ + unzip -o protoc-3.19.4-linux-x86_64.zip -d /usr/local include/* && \ + rm -rf protoc-3.19.4-linux-x86_64.zip -RUN go get -u google.golang.org/protobuf/cmd/protoc-gen-go && \ +RUN export GO111MODULE=off && \ + go get -u google.golang.org/protobuf/cmd/protoc-gen-go && \ go get -u google.golang.org/grpc/cmd/protoc-gen-go-grpc && \ go get -u github.com/gogo/protobuf/proto && \ go get -u github.com/gogo/protobuf/gogoproto && \ @@ -32,7 +33,7 @@ RUN mkdir -p /go/src/github.com/google /go/src/github.com/p4lang && \ mv protoc-gen-grpc-web-1.2.1-linux-x86_64 /usr/local/bin/protoc-gen-grpc-web && \ chmod +x /usr/local/bin/protoc-gen-grpc-web -RUN pip3 install --pre "betterproto[compiler]" +RUN python3 -m pip install -U build markupsafe==2.0.1 betterproto[compiler]==2.0.0b4 WORKDIR "/go/src/github.com/"