merge from x/gorm

.github/workflows/go.yml

@@ -47,7 +47,7 @@ jobs:
     name: Test
     strategy:
       matrix:
-        go-version: [ 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.21.x ]
+        go-version: [ 1.21.x, 1.22.x ]
         platform: [ windows-latest ]
     runs-on: ${{ matrix.platform }}
     steps:

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to paopao-ce are documented in this file.
 - 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,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # build frontend
-FROM node:19-alpine as frontend
+FROM node:19-alpine AS frontend
 ARG API_HOST
 ARG USE_API_HOST=yes
 ARG EMBED_UI=yes
@@ -12,17 +12,28 @@ RUN [ $EMBED_UI != yes ] || [ $USE_API_HOST != yes ] || echo "VITE_HOST='$API_HO
 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
+# build go mod cache
+FROM bitbus/paopao-ce-backend-builder:latest AS gomodcache
 ARG API_HOST
 ARG USE_API_HOST=yes
 ARG EMBED_UI=yes
 ARG USE_DIST=no
+ENV GOPROXY=https://goproxy.cn,direct
+WORKDIR /paopao-ce
+COPY go.mod .
+COPY go.sum .
+RUN go mod download
 
+# build backend
+FROM gomodcache 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
+ENV GOPROXY=https://goproxy.cn,direct
 RUN [ $EMBED_UI != yes ] || make build TAGS='go_json'
 RUN [ $EMBED_UI = yes ] || make build TAGS='slim embed go_json'
 
@@ -32,11 +43,9 @@ ARG USE_API_HOST=yes
 ARG EMBED_UI=yes
 ARG USE_DIST=no
 ENV TZ=Asia/Shanghai
-
 WORKDIR /app/paopao-ce
 COPY --from=backend /paopao-ce/release/paopao .
 COPY --from=backend /paopao-ce/config.yaml.sample config.yaml
-
 VOLUME ["/app/paopao-ce/custom"]
 EXPOSE 8008
 HEALTHCHECK --interval=5s --timeout=3s  --retries=3  CMD ps -ef | grep paopao || exit 1

Dockerfile.allinone

@@ -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 migration'
-RUN [ $EMBED_UI = yes ] || make build TAGS='slim embed go_json migration'
+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

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)

build-allinone.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+# eg.1 : sh build-image.sh
+# eg.2, set image: sh build-image.sh bitbus/paopao-ce
+
+VERSION=`git describe --tags --always | cut -f1,2 -d "-"` # eg.: 0.2.5
+IMAGE="bitbus/paopao-ce"
+
+if [ -n "$1" ]; then
+  IMAGE="$1"
+fi
+if [ -n "$2" ]; then
+  VERSION="$2"
+fi
+
+# build image
+docker buildx build \
+  --build-arg USE_DIST="yes" \
+  --tag "$IMAGE:all-in-one-${VERSION}" \
+  --tag "$IMAGE:all-in-one-latest" \
+  . -f Dockerfile.allinone
+
+# push to image rep
+# if [ -n "$1" ]; then
+#   docker push "$IMAGE:${VERSION}"
+#   docker push "$IMAGE:latest"
+# fi

docker-compose.yaml

@@ -67,7 +67,7 @@ services:
   #     - paopao-network
 
   meili:
-    image: getmeili/meilisearch:${MEILI_TAG:-v1.6}
+    image: getmeili/meilisearch:${MEILI_TAG:-v1.7}
     restart: always
     ports:
       - 7700:7700
@@ -124,7 +124,7 @@ services:
   #     - paopao-network
 
   backend:
-    image: bitbus/paopao-ce:${PAOPAOCE_TAG:-nightly}
+    image: bitbus/paopao-ce:${PAOPAOCE_TAG:-0.6-alpha}
     restart: always
     depends_on:
       - db

docs/openapi/index.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8" />
     <link rel="icon" href="/favicon.ico" />
     <title>paopao-ce develop documents</title>
-    <!-- Important: rapi-doc uses utf8 charecters -->
+    <!-- Important: rapi-doc uses utf8 characters -->
     <script
       type="module"
       src="/docs/openapi/assets/rapidoc-min.js"

docs/openapi/openapi.json

@@ -160,7 +160,7 @@
                 "type": "string"
               },
               "in": "header",
-              "description": "A set of `,` seperated content-types that could be sent as a response.\nE.g. `image/png,image/webp,image/gif`",
+              "description": "A set of `,` separated content-types that could be sent as a response.\nE.g. `image/png,image/webp,image/gif`",
               "required": false,
               "deprecated": false
             }