Skip to content

Commit 6426e2b

Browse files
committed
generate go codes on making dashboard-backend
1 parent 9f4ed10 commit 6426e2b

File tree

2 files changed

+20
-7
lines changed

2 files changed

+20
-7
lines changed

wsnet2-dashboard/backend/Dockerfile

+15-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
FROM node:18.18.2-bullseye-slim
22

3-
RUN apt-get update && apt-get install -y wget make && \
3+
RUN apt-get update && apt-get install -y wget make unzip && \
44
apt-get clean && rm -rf /var/lib/apt/lists/* && \
5-
wget -O arelo.tar.gz https://github.com/makiuchi-d/arelo/releases/download/v1.11.0/arelo_linux_$([ $(uname -m) = aarch64 ] && echo -n arm64 || echo -n x86_64).tar.gz && \
6-
tar xf arelo.tar.gz arelo && mv arelo /usr/local/bin && rm arelo.tar.gz && \
75
wget -O /wait-for-it.sh https://github.com/vishnubob/wait-for-it/raw/master/wait-for-it.sh > /dev/null 2>&1 && \
86
chmod +x /wait-for-it.sh
97

10-
ENV PATH /root/go/bin:/go/bin:$PATH
8+
ARG go_ver="1.22.0" \
9+
gopherjs_ver="v1.19.0-beta1" \
10+
gopherjs_go="go1.19.13" \
11+
protoc_ver="24.2"
12+
ENV PATH=/root/go/bin:/go/bin:$PATH \
13+
GOPHERJS_GOROOT=/root/sdk/${gopherjs_go}
1114
RUN cd / && \
12-
wget -O go.tar.gz https://go.dev/dl/go1.19.13.linux-$([ $(uname -m) = aarch64 ] && echo -n arm64 || echo -n amd64).tar.gz && \
15+
wget -O go.tar.gz https://go.dev/dl/go${go_ver}.linux-$([ $(uname -m) = aarch64 ] && echo -n arm64 || echo -n amd64).tar.gz && \
1316
tar xvf go.tar.gz && \
1417
rm go.tar.gz && \
15-
go install github.com/gopherjs/gopherjs@v1.19.0-beta1
18+
go install github.com/makiuchi-d/arelo@latest && \
19+
go install github.com/gopherjs/gopherjs@${gopherjs_ver} && \
20+
go install golang.org/dl/${gopherjs_go}@latest && \
21+
$gopherjs_go download && \
22+
wget -O protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_ver}/protoc-${protoc_ver}-linux-$(if [ $(uname -m) = "aarch64" ]; then echo aarch_64; else echo x86_64; fi).zip && \
23+
unzip -o protoc.zip "bin/*" "include/*" -d /usr/local && \
24+
rm protoc.zip
1625

1726
WORKDIR /repo/wsnet2-dashboard/backend

wsnet2-dashboard/backend/Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ PROTOC_GEN_TS := node_modules/.bin/protoc-gen-ts
1010

1111
proto := $(wildcard $(PROTO_SRC)/*.proto)
1212
pb.js := $(proto:$(PROTO_SRC)%.proto=$(PROTO_DST)%_pb.js)
13+
pb.go := $(proto:%.proto=%.pb.go)
1314

1415
.PHONY: build re-build run re-run clean install-deps
1516

@@ -35,9 +36,12 @@ install-deps:
3536
$(target): prisma/schema.prisma $(pb.js) $(src.ts) .env src/plugins/binary.js
3637
npx tsc
3738

38-
src/plugins/binary.js: ../../server/binary/*.go go-binary/*
39+
src/plugins/binary.js: ../../server/binary/*.go go-binary/* $(pb.go)
3940
cd go-binary && gopherjs build -o ../$@
4041

42+
%.pb.go: %.proto
43+
$(MAKE) -C ../../server generate
44+
4145
prisma/schema.prisma: $(wildcard ../../server/sql/trigger.d/db.trigger)
4246
if [ ! -e prisma/schema.prisma ]; then \
4347
rm -rf prisma; \

0 commit comments

Comments
 (0)