Merge pull request #563 from rocboss/dev

sync source code

.gitattributes

@@ -1,3 +1,4 @@
+*.ts linguist-language=go
 *.js linguist-language=go
 *.css linguist-language=go
 *.vue linguist-language=go

.github/workflows/go.yml

@@ -47,7 +47,7 @@ jobs:
     name: Test
     strategy:
       matrix:
-        go-version: [ 1.20.x, 1.21.x ]
+        go-version: [ 1.21.x, 1.22.x ]
         platform: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -66,7 +66,7 @@ jobs:
     name: TestOnWindows
     strategy:
       matrix:
-        go-version: [ 1.20.x, 1.21.x ]
+        go-version: [ 1.21.x, 1.22.x ]
         platform: [ windows-latest ]
     runs-on: ${{ matrix.platform }}
     steps:

CHANGELOG.md

@@ -2,7 +2,11 @@
 
 All notable changes to paopao-ce are documented in this file.
 ## 0.6.0+dev ([`dev`](https://github.com/rocboss/paopao-ce/tree/dev))
-TODO;
+### Added
+- add all-in-one docker image build scripts.
+- frontend: add tweets filter support use tag for home page and make it as default behavior.
+- add pin topic support.
+- support upload webp format image as picture when send tweet.
 
 ## 0.5.2
 ### Change

Dockerfile

@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:experimental
+# syntax=docker/dockerfile:1
 
 # build frontend
 FROM node:19-alpine as frontend
@@ -22,9 +22,9 @@ ARG USE_DIST=no
 WORKDIR /paopao-ce
 COPY . .
 COPY --from=frontend /web/dist ./web/dist
-ENV GOPROXY=https://goproxy.cn
-RUN [ $EMBED_UI != yes ] || make build TAGS='go_json'
-RUN [ $EMBED_UI = yes ] || make build TAGS='slim embed go_json'
+ENV GOPROXY=https://goproxy.cn,direct
+RUN --mount=type=cache,target=$GOPATH/go/pkg,id=paopao-ce-gopkg [ $EMBED_UI != yes ] || make buildx TAGS='go_json'
+RUN --mount=type=cache,target=$GOPATH/go/pkg,id=paopao-ce-gopkg [ $EMBED_UI = yes ] || make buildx TAGS='slim embed go_json'
 
 FROM bitbus/paopao-ce-backend-runner:latest
 ARG API_HOST

Dockerfile.allinone

@@ -0,0 +1,37 @@
+# syntax=docker/dockerfile:1
+
+# build frontend
+FROM node:19-alpine as frontend
+ARG API_HOST
+ARG USE_API_HOST=yes
+ARG EMBED_UI=yes
+ARG USE_DIST=no
+WORKDIR /web
+COPY web/ ./
+RUN [ $EMBED_UI != yes ] || [ $USE_API_HOST != yes ] || echo "VITE_HOST='$API_HOST'">.env.local
+RUN [ $EMBED_UI != yes ] || [ $USE_DIST != no ] || (yarn && yarn build)
+RUN [ $EMBED_UI = yes ] || mkdir dist || echo ""
+
+# build backend
+FROM bitbus/paopao-ce-backend-builder:latest AS backend
+ARG API_HOST
+ARG USE_API_HOST=yes
+ARG EMBED_UI=yes
+ARG USE_DIST=no
+
+WORKDIR /paopao-ce
+COPY . .
+COPY --from=frontend /web/dist ./web/dist
+ENV GOPROXY=https://goproxy.cn,direct
+RUN --mount=type=cache,target=$GOPATH/go/pkg,id=paopao-ce-gopkg [ $EMBED_UI != yes ] || make buildx TAGS='go_json migration'
+RUN --mount=type=cache,target=$GOPATH/go/pkg,id=paopao-ce-gopkg [ $EMBED_UI = yes ] || make buildx TAGS='slim embed go_json migration'
+
+FROM bitbus/paopao-ce-allinone-runner:latest
+ARG API_HOST
+ARG USE_API_HOST=yes
+ARG EMBED_UI=yes
+ARG USE_DIST=no
+ENV TZ=Asia/Shanghai
+
+WORKDIR /app
+COPY --from=backend /paopao-ce/release/paopao .

Makefile

@@ -32,6 +32,10 @@ LDFLAGS = -X "${MOD_NAME}/pkg/version.version=${BUILD_VERSION}" \
 all: fmt build
 
 build:
+	@echo Build paopao-ce
+	@go build -pgo=auto -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(RELEASE_ROOT)/$(TARGET)
+
+buildx:
 	@go mod download
 	@echo Build paopao-ce
 	@go build -pgo=auto -trimpath -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $(RELEASE_ROOT)/$(TARGET)
@@ -115,10 +119,10 @@ pre-commit: fmt
 
 .PHONY: install-protobuf-plugins
 install-protobuf-plugins:
-	@go install github.com/bufbuild/buf/cmd/buf@v1.25.0
-	@go install github.com/bufbuild/buf/cmd/protoc-gen-buf-breaking@v1.25.0
-	@go install github.com/bufbuild/buf/cmd/protoc-gen-buf-lint@v1.25.0
-	@go install github.com/bufbuild/connect-go/cmd/protoc-gen-connect-go@latest
+	@go install github.com/bufbuild/buf/cmd/buf@v1.28.1
+	@go install github.com/bufbuild/buf/cmd/protoc-gen-buf-breaking@v1.28.1
+	@go install github.com/bufbuild/buf/cmd/protoc-gen-buf-lint@v1.28.1
+	@go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest
 	@go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest
 	@go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
 	@go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest

README.md

@@ -52,7 +52,7 @@ PaoPao主要由以下优秀的开源项目/工具构建
 * [Mir](https://github.com/alimy/mir 'go-mir')
 * [Buf](https://github.com/bufbuild/buf 'buf')
 * [gRPC](https://github.com/grpc/grpc-go 'grpc-go')
-* [Zinc](https://zinclabs.io/ 'zinc')
+* [Meilisearch](https://www.meilisearch.com/ 'meilisearch')
 
 #### 前端: 
 * [Naive UI](https://www.naiveui.com/)
@@ -69,9 +69,7 @@ PaoPao主要由以下优秀的开源项目/工具构建
 * Node.js (14+)
 * MySQL (5.7+)
 * Redis
-* Zinc
-
-> Zinc是一款轻量级全文搜索引擎，可以查阅 <https://zincsearch.com/> 安装
+* Meilisearch
 
 以上环境版本为PaoPao官方的开发版本，仅供参考，其他版本的环境未进行充分测试
 
@@ -221,6 +219,23 @@ PaoPao主要由以下优秀的开源项目/工具构建
   docker run -d -p 8010:80 your/paopao-ce:web
   ```
 
+  * All-In-One:
+  ```sh
+  # 构建Image
+  docker buildx build --build-arg USE_DIST="yes" -t your/paopao-ce:all-in-one-latest -f Dockerfile.allinone .
+
+  # 运行
+  docker run --name paopao-ce-allinone  -d -p 8000:8008 -p 7700:7700 -v ./data/custom:/app/custom -v ./data/meili_data:/app/meili_data your/paopao-ce:all-in-one-latest
+
+  # 或者使用官方Image运行
+  docker run --name paopao-ce-allinone  -d -p 8000:8008 -p 7700:7700 -v ./data/custom:/app/custom -v ./data/meili_data:/app/meili_data bitbus/paopao-ce:all-in-one-latest
+
+  # 或者使用官方Image运行 + 自定义config.yaml
+  docker run --name paopao-ce-allinone  -d -p 8000:8008 -p 7700:7700 -v ./config.yaml:/app/config.yaml -v ./data/custom:/app/custom -v ./data/meili_data:/app/meili_data bitbus/paopao-ce:all-in-one-latest
+  ```
+  > 注意在`config.yaml` 中`Meili.ApiKey`的值必须与容器中meili启动时设定的`MEILI_MASTER_KEY`环境变量值相同，默认为`paopao-meilisearch`. 可以在docker启动容器时通过`-e MEILI_MASTER_KEY=<custom-key>`设置该值。
+
+
 ### 方式三. 使用 docker-compose 运行
 ```sh
 git clone https://github.com/rocboss/paopao-ce.git