Skip to content

armgit / memos

Public Imported from GitHub
0

Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.

feat: flag variables

emailf982391a8356
diff --git a/Dockerfile b/Dockerfile
index 62ba68524..557536599 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,6 +26,9 @@ WORKDIR /usr/local/memos
COPY --from=backend /backend-build/memos /usr/local/memos/
COPY --from=frontend /frontend-build/dist /usr/local/memos/web/dist
-CMD ["./memos"]
+# Directory to store the data, which can be referenced as the mounting point.
+RUN mkdir -p /var/opt/memos
-EXPOSE 8080
+CMD ["-mode", "release", "-port", "8080", "-data", "/var/opt/memos"]
+
+ENTRYPOINT ["./memos"]
diff --git a/bin/server/cmd/profile.go b/bin/server/cmd/profile.go
new file mode 100644
index 000000000..8af91015c
--- /dev/null
+++ b/bin/server/cmd/profile.go
@@ -0,0 +1,62 @@
+package cmd
+
+import (
+ "flag"
+ "fmt"
+ "os"
+ "path/filepath"
+ "strings"
+)
+
+type Profile struct {
+ // mode can be "release" or "dev"
+ mode string
+ // port is the binding port for server.
+ port int
+ // dsn points to where Memos stores its own data
+ dsn string
+}
+
+func checkDSN(dataDir string) (string, error) {
+ // Convert to absolute path if relative path is supplied.
+ if !filepath.IsAbs(dataDir) {
+ absDir, err := filepath.Abs(filepath.Dir(os.Args[0]) + "/" + dataDir)
+ if err != nil {
+ return "", err
+ }
+ dataDir = absDir
+ }
+
+ // Trim trailing / in case user supplies
+ dataDir = strings.TrimRight(dataDir, "/")
+
+ if _, err := os.Stat(dataDir); err != nil {
+ error := fmt.Errorf("unable to access --data %s, %w", dataDir, err)
+ return "", error
+ }
+
+ return dataDir, nil
+}
+
+// GetDevProfile will return a profile for dev.
+func GetProfile() Profile {
+ mode := flag.String("mode", "dev", "")
+ port := flag.Int("port", 8080, "")
+ data := flag.String("data", "", "")
+
+ flag.Parse()
+
+ dataDir, err := checkDSN(*data)
+ if err != nil {
+ fmt.Printf("%+v\n", err)
+ os.Exit(1)
+ }
+
+ dsn := fmt.Sprintf("file:%s/memos_%s.db", dataDir, *mode)
+
+ return Profile{
+ mode: *mode,
+ port: *port,
+ dsn: dsn,
+ }
+}
diff --git a/bin/server/cmd/profile_dev.go b/bin/server/cmd/profile_dev.go
deleted file mode 100644
index 15a7dac8b..000000000
--- a/bin/server/cmd/profile_dev.go
+++ /dev/null
@@ -1,17 +0,0 @@
-//go:build !release
-// +build !release
-
-package cmd
-
-import (
- "fmt"
-)
-
-// GetDevProfile will return a profile for dev.
-func GetDevProfile(dataDir string) Profile {
- return Profile{
- mode: "8080",
- port: 8080,
- dsn: fmt.Sprintf("file:%s/memos_dev.db", dataDir),
- }
-}
diff --git a/bin/server/cmd/root.go b/bin/server/cmd/root.go
index 1a52340f1..fefab12fb 100644
--- a/bin/server/cmd/root.go
+++ b/bin/server/cmd/root.go
@@ -3,47 +3,11 @@ package cmd
import (
"fmt"
"os"
- "path/filepath"
- "strings"
"memos/server"
"memos/store"
)
-var (
- dataDir string
-)
-
-type Profile struct {
- // mode can be "release" or "dev"
- mode string
- // port is the binding port for server.
- port int
- // dsn points to where Memos stores its own data
- dsn string
-}
-
-func checkDataDir() error {
- // Convert to absolute path if relative path is supplied.
- if !filepath.IsAbs(dataDir) {
- absDir, err := filepath.Abs(filepath.Dir(os.Args[0]) + "/" + dataDir)
- if err != nil {
- return err
- }
- dataDir = absDir
- }
-
- // Trim trailing / in case user supplies
- dataDir = strings.TrimRight(dataDir, "/")
-
- if _, err := os.Stat(dataDir); err != nil {
- error := fmt.Errorf("unable to access --data %s, %w", dataDir, err)
- return error
- }
-
- return nil
-}
-
type Main struct {
profile *Profile
@@ -53,17 +17,11 @@ type Main struct {
}
func Execute() {
- err := checkDataDir()
- if err != nil {
- fmt.Printf("%+v\n", err)
- os.Exit(1)
- }
-
m := Main{}
- profile := GetDevProfile(dataDir)
+ profile := GetProfile()
m.profile = &profile
- err = m.Run()
+ err := m.Run()
if err != nil {
fmt.Printf("%+v\n", err)
os.Exit(1)
diff --git a/store/seed/10001_schema.sql b/store/seed/10001_schema.sql
index 76086342f..f8f0e6813 100644
--- a/store/seed/10001_schema.sql
+++ b/store/seed/10001_schema.sql
@@ -120,9 +120,9 @@ END;
INSERT INTO user
(`id`, `name`, `password`, `open_id`)
VALUES
- (1, 'guest', '123456', 'guest_open_id'),
+ (1, 'guest', '123456', 'guest_open_id');
INSERT INTO memo
(`content`, `creator_id`)
VALUES
- ('πŸ‘‹ Welcome to memos', 1),
+ ('πŸ‘‹ Welcome to memos', 1);