update 26.8.7

.idea/workspace.xml

@@ -4,8 +4,7 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ae3fb6a0-aca4-4c0a-858b-91952e6dcdd3" name="更改" comment="update 26.7.30">
+    <list default="true" id="ae3fb6a0-aca4-4c0a-858b-91952e6dcdd3" name="更改" comment="update 26.8.6">
-      <change afterPath="$PROJECT_DIR$/4600Pro/NocoDB/docker-compose.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -25,23 +24,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
+  <component name="PropertiesComponent">{
-  "keyToString": {
+  &quot;keyToString&quot;: {
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    "RunOnceActivity.ShowReadmeOnStart": "true",
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    "RunOnceActivity.git.unshallow": "true",
+    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    "codeWithMe.voiceChat.enabledByDefault": "false",
+    &quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
-    "git-widget-placeholder": "main",
+    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    "last_opened_file_path": "/Users/kun/PycharmProjects/Docker_Compose/4600Pro/NocoDB",
+    &quot;last_opened_file_path&quot;: &quot;/Users/kun/PycharmProjects/Docker_Compose/4600Pro/NocoDB&quot;,
-    "node.js.detected.package.jshint": "true",
+    &quot;node.js.detected.package.jshint&quot;: &quot;true&quot;,
-    "node.js.selected.package.jshint": "",
+    &quot;node.js.selected.package.jshint&quot;: &quot;&quot;,
-    "nodejs_package_manager_path": "npm",
+    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    "settings.editor.selected.configurable": "configurable.group.project"
+    &quot;settings.editor.selected.configurable&quot;: &quot;configurable.group.project&quot;
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/4600Pro/NocoDB" />
@@ -78,6 +77,8 @@
       <workItem from="1785223194581" duration="22000" />
       <workItem from="1785392379765" duration="65000" />
       <workItem from="1786005163392" duration="201000" />
+      <workItem from="1786005375680" duration="538000" />
+      <workItem from="1786065138152" duration="11000" />
     </task>
     <task id="LOCAL-00001" summary="update 26.7.27">
       <option name="closed" value="true" />
@@ -167,7 +168,15 @@
       <option name="project" value="LOCAL" />
       <updated>1785392423458</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="update 26.8.6">
+      <option name="closed" value="true" />
+      <created>1786005435040</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1786005435040</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -176,6 +185,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="update 26.7.27" />
     <MESSAGE value="update 26.7.30" />
-    <option name="LAST_COMMIT_MESSAGE" value="update 26.7.30" />
+    <MESSAGE value="update 26.8.6" />
+    <option name="LAST_COMMIT_MESSAGE" value="update 26.8.6" />
   </component>
 </project>

4600Pro/NocoDB/docker-compose.yaml

@@ -1,9 +1,36 @@
 services:
+
   noco:
     image: nocodb/nocodb:latest
     container_name: noco
     restart: unless-stopped
+    depends_on:
+      - postgres
     ports:
       - "2800:8080"
+    environment:
+      NC_DB: "pg://postgres:5432?u=nocodb&p=nocodb123&d=nocodb"
+      NC_AUTH_JWT_SECRET: "change_this_to_random_string"
     volumes:
-      - /volume2/docker/docker_projects/nocodb:/usr/app/data
+      - /volume2/docker/docker_projects/nocodb/data:/usr/app/data
+    networks:
+      - nocodb
+
+
+  postgres:
+    image: postgres:16
+    container_name: nocodb-postgres
+    restart: unless-stopped
+    environment:
+      POSTGRES_DB: nocodb
+      POSTGRES_USER: nocodb
+      POSTGRES_PASSWORD: nocodb123
+    volumes:
+      - /volume2/docker/docker_projects/nocodb/postgres:/var/lib/postgresql/data
+    networks:
+      - nocodb
+
+
+networks:
+  nocodb:
+    driver: bridge