Merge remote-tracking branch 'github/main'

# Conflicts:
#	docker-compose.yml

.gitignore

@@ -1,6 +1,6 @@
 .idea/
 .DS_Store
-workspace
+workspace/
 backup
 *.iml
 .env.docker

README.md

@@ -6,6 +6,8 @@ my note for docker
 
 ```bash
 docker compose up --build
+docker compose -f docker-compose-test.yml up --build
+docker compose -f docker-compose-private.yml up --build
 ```
 
 Run background

docker-compose-private.yml

@@ -0,0 +1,30 @@
+# docker-compose --log-level INFO up --build  
+# docker-compose --log-level INFO up -d --build
+
+version: '3'
+services:
+  private-note:
+    stdin_open: true
+    tty: true
+    image: b3log/siyuan:v2.10.13
+    ports:
+      - "6807:6806"
+    environment:
+      - "TZ=CST-8"
+    volumes:
+      - ./workspace:/home/siyuan/Documents
+    restart: "no"
+#    networks:
+#      - private_note_blog_network
+#
+#  private-blog:
+#    image: terwer/nuxt3-blog:latest
+#    ports:
+#      - "3333:3000"
+#    env_file:
+#      - ./.env.docker
+#    networks:
+#      - private_note_blog_network
+#
+#networks:
+#  private_note_blog_network:

docker-compose-test.yml

@@ -0,0 +1,31 @@
+# docker-compose --log-level INFO up --build  
+# docker-compose --log-level INFO up -d --build
+
+version: '3'
+services:
+  test-note:
+    stdin_open: true
+    tty: true
+    image: b3log/siyuan:v2.10.13
+    command: [ "--workspace=/home/siyuan/Documents", "--accessAuthCode=123456" ]
+    ports:
+      - "6806:6806"
+    environment:
+      - "TZ=CST-8"
+    volumes:
+      - ./workspace:/home/siyuan/Documents
+    restart: "no"
+#    networks:
+#      - test_note_blog_network
+#
+#  test-blog:
+#    image: terwer/nuxt3-blog:latest
+#    ports:
+#      - "3333:3000"
+#    env_file:
+#      - ./.env.docker
+#    networks:
+#      - test_note_blog_network
+#
+#networks:
+#  test_note_blog_network:

docker-compose-zhangy.yml

@@ -0,0 +1,30 @@
+# docker-compose --log-level INFO up --build  
+# docker-compose --log-level INFO up -d --build
+
+version: '3'
+services:
+  zhangy-note:
+    stdin_open: true
+    tty: true
+    image: b3log/siyuan:v2.10.13
+    ports:
+      - "6809:6806"
+    environment:
+      - "TZ=CST-8"
+    volumes:
+      - ./workspace:/home/siyuan/Documents
+    restart: "no"
+#    networks:
+#      - zhangy_note_blog_network
+#
+#  zhangy-blog:
+#    image: terwer/nuxt3-blog:latest
+#    ports:
+#      - "3333:3000"
+#    env_file:
+#      - ./.env.docker
+#    networks:
+#      - zhangy_note_blog_network
+#
+#networks:
+#  zhangy_note_blog_network: