Merge branch 'dev' into alpha

rocboss · Aug 23, 2024 · 4c66694 · 4c66694
2 parents 990a908 + 2f8e6f0
commit 4c66694
Show file tree

Hide file tree

Showing 28 changed files with 297 additions and 231 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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

diff --git a/Dockerfile.allinone b/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

diff --git a/Makefile b/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)

diff --git a/auto/api/m/v1/user.go b/auto/api/m/v1/user.go
diff --git a/auto/api/r/v1/user.go b/auto/api/r/v1/user.go
diff --git a/auto/api/s/v1/user.go b/auto/api/s/v1/user.go
diff --git a/auto/api/v1/admin.go b/auto/api/v1/admin.go
diff --git a/auto/api/v1/alipay_priv.go b/auto/api/v1/alipay_priv.go
diff --git a/auto/api/v1/alipay_pub.go b/auto/api/v1/alipay_pub.go
diff --git a/auto/api/v1/core.go b/auto/api/v1/core.go
diff --git a/auto/api/v1/followship.go b/auto/api/v1/followship.go
diff --git a/auto/api/v1/friendship.go b/auto/api/v1/friendship.go
diff --git a/auto/api/v1/loose.go b/auto/api/v1/loose.go
diff --git a/auto/api/v1/priv.go b/auto/api/v1/priv.go
diff --git a/auto/api/v1/pub.go b/auto/api/v1/pub.go
diff --git a/auto/api/v1/relax.go b/auto/api/v1/relax.go
diff --git a/auto/api/v1/site.go b/auto/api/v1/site.go
diff --git a/auto/api/v1/trends.go b/auto/api/v1/trends.go
diff --git a/auto/api/x/v1/user.go b/auto/api/x/v1/user.go
diff --git a/build-allinone.sh b/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
diff --git a/docker-compose.yaml b/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

diff --git a/docs/openapi/index.html b/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"

diff --git a/docs/openapi/openapi.json b/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
             }