diff --git a/bin/server/cmd/profile.go b/bin/server/cmd/profile.go index b176bb0c..bed3b0e2 100644 --- a/bin/server/cmd/profile.go +++ b/bin/server/cmd/profile.go @@ -42,7 +42,7 @@ func checkDSN(dataDir string) (string, error) { func GetProfile() Profile { mode := flag.String("mode", "dev", "") port := flag.Int("port", 8080, "") - data := flag.String("data", "", "") + data := flag.String("data", "/var/opt/memos", "") flag.Parse() dataDir, err := checkDSN(*data) diff --git a/docs/deploy/docker-deploy-guide.md b/docs/deploy/docker-deploy-guide.md index 637735f0..16ff30cd 100644 --- a/docs/deploy/docker-deploy-guide.md +++ b/docs/deploy/docker-deploy-guide.md @@ -1,17 +1,17 @@ -# 使用 Docker 部署 +# Deploy `memos` with Docker -1. 下载初始化数据库文件至本地 `~/data/memos.db`,运行命令: +1. download the initialized db file: ```shell mkdir ~/data cd ~/data - wget --no-check-certificate https://github.com/justmemos/memos/blob/main/resources/memos.db?raw=true + wget --no-check-certificate https://github.com/justmemos/memos/blob/main/resources/memos-release.db?raw=true ``` -2. 创建并启动容器,镜像里包含所需的所有环境。只需自行 pull + run,即可完成部署: +2. pull and run docker image: ```docker - docker run --rm --pull always --name memos -p 8080:8080 -v ~/data/:/usr/local/memos/data/ -d neosmemo/memos + docker run --name memos --restart always --publish 8080:8080 --volume ~/path/to/your/data/:/var/opt/memos/ neosmemo/memos:next -mode release ``` -默认数据库内会有两个帐号,分别为 `test` 和 `guest` ,密码均为 `123456`。 +The default user account is `guest` with password `123456`. diff --git a/store/resource.go b/store/resource.go index 306a8391..fa235a52 100644 --- a/store/resource.go +++ b/store/resource.go @@ -100,6 +100,7 @@ func createResource(db *DB, create *api.ResourceCreate) (*api.Resource, error) { func findResourceList(db *DB, find *api.ResourceFind) ([]*api.Resource, error) { where, args := []string{"1 = 1"}, []interface{}{} + if v := find.Id; v != nil { where, args = append(where, "id = ?"), append(args, *v) }