chore(release): 2.1.16

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   package:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
     - name: Golang env
       uses: actions/setup-go@v2

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.1.16](https://github.com/eiblog/eiblog/compare/v2.1.15...v2.1.16) (2022-11-20)
+
+
+### Bug Fixes
+
+* **backup:** error path in compressed file ([aa91997](https://github.com/eiblog/eiblog/commit/aa91997c0caca27e9979692879f8877765dabd9d))
+* rss image path incorrect: data-src -> src ([4bfff2e](https://github.com/eiblog/eiblog/commit/4bfff2e5e9b0efb4112a5f2f6bc55eebcef1c6eb))
+
+### [2.1.15](https://github.com/eiblog/eiblog/compare/v2.1.14...v2.1.15) (2022-09-28)
+
+### [2.1.14](https://github.com/eiblog/eiblog/compare/v2.1.13...v2.1.14) (2022-09-28)
+
+
+### Bug Fixes
+
+* cgo and sqlite build in alpine image closed [#28](https://github.com/eiblog/eiblog/issues/28) ([b93c320](https://github.com/eiblog/eiblog/commit/b93c320987a936db6e5ca50c547022de9ab9a0f1))
+
+### [2.1.13](https://github.com/eiblog/eiblog/compare/v2.1.12...v2.1.13) (2022-09-27)
+
+### [2.1.12](https://github.com/eiblog/eiblog/compare/v2.1.11...v2.1.12) (2022-08-09)
+
+
+### Bug Fixes
+
+* [#35](https://github.com/eiblog/eiblog/issues/35) no pubDate added for feed generation ([289b814](https://github.com/eiblog/eiblog/commit/289b8145bcdabd0060c9a0d5f40f5df69d3882d3))
+
+### [2.1.11](https://github.com/eiblog/eiblog/compare/v2.1.10...v2.1.11) (2022-07-19)
+
+
+### Bug Fixes
+
+* **backup:** configuration error ([38aa704](https://github.com/eiblog/eiblog/commit/38aa704198070d3e1436b230b40b1deb3e94c5ac))
+
+### [2.1.10](https://github.com/eiblog/eiblog/compare/v2.1.9...v2.1.10) (2022-04-22)
+
 ### [2.1.9](https://github.com/eiblog/eiblog/compare/v2.1.8...v2.1.9) (2022-02-14)
 
 

README.md

@@ -6,9 +6,43 @@
 
 但它有着部署简单（上线复杂！）的特点，不推荐没有计算机知识的朋友搭建，欢迎咨询。该博客的个中优点（简洁、轻快，安全），等你体验。
 
+Docker镜像地址：
+
+* 博客服务：[deepzz0/eiblog](https://hub.docker.com/r/deepzz0/eiblog)
+* 博客搜索：[deepzz0/elasticsearch](https://hub.docker.com/r/deepzz0/elasticsearch)
+* 数据备份：[deepzz0/backup](https://hub.docker.com/r/deepzz0/backup)
+
 ### 快速体验
 
-这里以 mongodb 为例，更多支持的后端存储服务如下：
+**二进制**
+
+1、下载压缩包，到 [这里](https://github.com/eiblog/eiblog/releases) 下载 eiblog（非backup） 相应系统压缩包，然后解压缩。
+
+2、启动服务：`./backend`
+
+**Docker**
+
+```
+$ docker run --name eiblog \
+    -p 9000:9000 \
+    deepzz0/eiblog:latest
+```
+
+**Compose**
+
+参考项目根目录下的 [docker-compose.yml](https://github.com/eiblog/eiblog/blob/v2/docker-compose.yml)，修改相关配置：
+
+```
+$ docker compose up -d
+或
+$ docker-compose up -d
+```
+
+然后访问 `localhost:9000` 就可以了，后台地址 `localhost:9000/admin/login`，默认账户密码 `deepzz/deepzz`。
+
+> 默认情况下未开启博客搜索 `elasticsearch`，需要的话需要启动 es 服务并修改配置 `app.yml`。
+
+**数据库支持**
 
 | 类型（driver） | 地址（source）示例                                           |
 | -------------- | ------------------------------------------------------------ |
@@ -19,42 +53,6 @@
 | sqlserver      | sqlserver://user:password@localhost:9930?database=eiblog     |
 | clickhouse     | tcp://localhost:9000?database=eiblog&username=user&password=password&read_timeout=10&write_timeout=20 |
 
-1、启动依赖服务，mongodb、elasticsearch：
-
-```
-$ docker run --name mongodb \
-    -p 27017:27017 \
-    -v ${PWD}/mgodb:/data/db \
-    mongo:3.2
-
-$ docker run --name elasticsearch \
-    -p 9200:9200 \
-    -v ${PWD}/esdata:/usr/share/elasticsearch/data \
-    deepzz0/elasticsearch:2.4.1
-```
-
-2、下载压缩包，到 [这里](https://github.com/eiblog/eiblog/releases) 下载 eiblog（非backup） 相应系统压缩包，然后解压缩。
-
-3、修改配置，将数据库与ES地址修改为相应地址：
-
-```
-# 修改 conf/app.yml 数据库连接配置
-database:
-  driver: mongodb
-  source: mongodb://localhost:27017
-
-# 修改 conf/app.yml ES连接配置，如果不启用搜索功能可以置空
-eshost: http://localhost:9200
-```
-
-4、启动服务：
-
-```
-./backend
-```
-
-然后访问 `localhost:9000` 就可以了，后台地址 `localhost:9000/admin/login`，默认账户密码 `deepzz/deepzz`。
-
 ### 功能特性
 
 本着博客本质用来分享知识的特点，`EiBlog` 不会有较强的定制功能（包括主题，CDN支持等），仅保持常用简单页面与功能：
@@ -85,7 +83,7 @@ eshost: http://localhost:9200
 
 ### 博客页面
 
-可以容易的看到 [httpsecurityreport](https://httpsecurityreport.com/?report=deepzz.com) 评分`96`，[ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=deepzz.com&latest) 评分`A+`，[myssl](https://myssl.com/deepzz.com) 评分`A+`，堪称完美。这些安全的相关配置会在后面的部署过程中接触到。
+可以容易的看到 [ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=deepzz.com&latest) 评分`A+`，[myssl](https://myssl.com/deepzz.com) 评分`A+`，堪称完美。这些安全的相关配置会在后面的部署过程中接触到。
 
 ![show-home](./docs/img/show-home.png)
 ![show-home2](./docs/img/show-home2.png)

cmd/backup/main.go

@@ -30,7 +30,7 @@ func runTimer(endRun chan error) {
 }
 
 func runHTTPServer(endRun chan error) {
-	if !config.Conf.EiBlogApp.EnableHTTP {
+	if !config.Conf.BackupApp.EnableHTTP {
 		return
 	}
 
@@ -46,7 +46,7 @@ func runHTTPServer(endRun chan error) {
 	ping.RegisterRoutes(e)
 
 	// start
-	address := fmt.Sprintf(":%d", config.Conf.EiBlogApp.HTTPPort)
+	address := fmt.Sprintf(":%d", config.Conf.BackupApp.HTTPPort)
 	go func() {
 		endRun <- e.Run(address)
 	}()

conf/app.yml

@@ -1,7 +1,7 @@
 appname: eiblog
 database:
-  driver: postgres
-  source: host=localhost port=5432 user=postgres dbname=eiblog sslmode=disable password=MTI3LjAuMC4x
+  driver: sqlite
+  source: ./db.sqlite
 eshost:
 eiblogapp:
   mode:

docker-compose.yml

@@ -21,7 +21,6 @@ services:
     - elasticsearch
     - mongodb
     environment:
-    - GODEBUG=netdns=cgo
     - RUN_MODE=prod
     ports:
     - 127.0.0.1:9000:9000

eiblog.conf

@@ -17,7 +17,7 @@ server {
     server_tokens                off;
 
     location / {
-        rewrite                  ^/(.*)$ https://$host/$1 permanent;
+        rewrite                  ^/(.*)$ https://deepzz.com/$1 permanent;
     }
 }
 
@@ -61,6 +61,10 @@ server {
         root                     /usr/share/nginx/html;
         expires                  1d;
     }
+    
+    if ($host != 'deepzz.com' ) {
+        rewrite          ^/(.*)$  https://deepzz.com/$1 permanent;
+    }
 
     # proxy setting
     proxy_http_version           1.1;

go.mod

@@ -3,7 +3,6 @@ module github.com/eiblog/eiblog
 go 1.15
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/eiblog/blackfriday v0.0.0-20161010144836-c0ec111761ae
 	github.com/gin-contrib/sessions v0.0.3
 	github.com/gin-gonic/gin v1.7.4
@@ -17,7 +16,7 @@ require (
 	go.mongodb.org/mongo-driver v1.5.1
 	google.golang.org/grpc v1.35.0
 	google.golang.org/protobuf v1.25.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	gorm.io/driver/clickhouse v0.1.0
 	gorm.io/driver/mysql v1.0.6
 	gorm.io/driver/postgres v1.0.8

go.sum

@@ -8,8 +8,6 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk=
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/bkaradzic/go-lz4 v1.0.0 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk=

pkg/config/config.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var (

pkg/core/backup/timer/qiniu/qiniu.go

@@ -44,7 +44,7 @@ func backupFromMongoDB(now time.Time) error {
 	}
 	// tar
 	name := fmt.Sprintf("eiblog-%s.tar.gz", now.Format("2006-01-02"))
-	arg = fmt.Sprintf("tar czf /tmp/%s /tmp/eiblog", name)
+	arg = fmt.Sprintf("tar czf /tmp/%s -C /tmp eiblog", name)
 	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
 	err = cmd.Run()
 	if err != nil {

pkg/core/eiblog/file/timer.go

@@ -21,7 +21,8 @@ func init() {
 
 	var err error
 	xmlTmpl, err = template.New("").Funcs(template.FuncMap{
-		"dateformat": tools.DateFormat,
+		"dateformat":  tools.DateFormat,
+		"imgtonormal": tools.ImgToNormal,
 	}).ParseGlob(root)
 	if err != nil {
 		panic(err)

scripts/dist_tar.sh

@@ -10,8 +10,8 @@ for file in pkg/core/*; do
   # tar platform
   for os in linux darwin windows; do
     _target="$app-$_tag.$os-$_arch.tar.gz"
-    CGO_ENABLED=0 GOOS=$os GOARCH=$_arch \
-      go build -tags prod -o backend "./cmd/$app"
+    GOOS=$os GOARCH=$_arch \
+      go build -tags prod -ldflags '-extldflags "-static"' -o backend "./cmd/$app"
     if [ "$app" = "eiblog" ]; then
       tar czf $_target conf website assets backend
     else

scripts/run_build.sh

@@ -20,7 +20,7 @@ mkdir -p ./bin
 # build demo app
 for file in pkg/core/*; do
   app="$(basename $file)";
-  CGO_ENABLED=0 go build -tags prod -o bin/backend "./cmd/$app"
+  go build -tags prod -ldflags '-extldflags "-static"' -o bin/backend "./cmd/$app"
   # docker image
   docker buildx build --platform "$_platform" \
     -f "build/package/$app.Dockerfile" \

tools/tmplfunc.go

@@ -73,3 +73,8 @@ func GetAvatar(domain string) string {
 
 	return avatar
 }
+
+// ImgToNormal replace lazy image attr data-src to src
+func ImgToNormal(content string) string {
+	return strings.ReplaceAll(content, "data-src=", "src=")
+}

website/template/feedTpl.xml

@@ -15,8 +15,9 @@
             <comments>https://{{$.Host}}/post/{{.Slug}}.html#comments</comments>
             <guid>https://{{$.Host}}/post/{{.Slug}}.html</guid>
             <description>
-                <![CDATA[<blockquote>{{.Content}}<p>本文链接：<a href="https://{{$.Host}}/post/{{.Slug}}.html">https://{{$.Host}}/post/{{.Slug}}.html</a>，<a href="https://{{$.Host}}/post/{{.Slug}}.html#comments">参与评论 »</a></p>]]>
+                <![CDATA[{{imgtonormal .Content}}<p>本文链接：<a href="https://{{$.Host}}/post/{{.Slug}}.html">https://{{$.Host}}/post/{{.Slug}}.html</a>，<a href="https://{{$.Host}}/post/{{.Slug}}.html#comments">参与评论 »</a></p>]]>
             </description>
+            <pubDate>{{dateformat .CreatedAt "Mon, 02 Jan 2006 15:04:05 -0700"}}</pubDate>
         </item>
         {{end}}
     </channel>