fix: make generate & build

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Jul 3, 2019 · 54611d4 · 54611d4
1 parent 99d7166
commit 54611d4
Show file tree

Hide file tree

Showing 46 changed files with 21,950 additions and 7,622 deletions.
diff --git a/build/docker/protoc/Dockerfile b/build/docker/protoc/Dockerfile
@@ -21,7 +21,7 @@ RUN     rm -f /go/bin/web-editor
 
 FROM    golang:1.12-alpine
 RUN     apk --no-cache add git make protobuf gcc libc-dev nodejs-npm && mkdir -p /.cache/go-build && chmod -R 777 /.cache
-RUN     mkdir -p /node/ && cd /node && npm install -g npm@6.9.0 protobufjs prettier prettier-eslint prettier-eslint-cli  pbhbs@latest
+RUN     mkdir -p /node/ && cd /node && npm install -g npm@6.9.0 protobufjs prettier prettier-eslint prettier-eslint-cli  pbhbs@0.1.0
 RUN     echo 'syntax = "proto3";' | /usr/bin/pbjs - > /dev/null # init pbjs
 COPY    --from=pgg /go/bin/* /go/bin/
 COPY    --from=builder /go/bin/* /go/bin/

diff --git a/build/docker/protoc/Makefile b/build/docker/protoc/Makefile
@@ -1,4 +1,4 @@
-IMAGE ?= bertychat/protoc:v11
+IMAGE ?= bertychat/protoc:v12
 
 rebuild:
 	docker build --no-cache --pull -t $(IMAGE) .