@atomservice/postgres 0.1.17 → 0.1.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomservice/postgres",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "PostgreSQL 原子服务",
   "type": "module",
   "author": "openorson",
@@ -28,6 +28,6 @@
     ".": "./src/index.ts"
   },
   "peerDependencies": {
-    "@atomservice/core": "0.1.17"
+    "@atomservice/core": "0.1.19"
   }
 }

package/src/postgres.compose.ts

@@ -1,4 +1,4 @@
-import { tmpl } from "@atomservice/core"
+import { composeResourcesBlock, tmpl } from "@atomservice/core"
 import { POSTGRES_IMAGE } from "./postgres.consts.ts"
 import type { PostgresOptions } from "./postgres.options.ts"
 
@@ -6,9 +6,11 @@ export function postgresCompose(
   containerName: string,
   version: string,
   dataDir: string,
-  opts: Pick<PostgresOptions, "password" | "hostPort" | "maxConnections" | "sharedBuffers">,
+  opts: Pick<PostgresOptions, "password" | "hostPort" | "maxConnections" | "sharedBuffers" | "resources" | "restart">,
 ): string {
-  const { password, hostPort, maxConnections, sharedBuffers } = opts
+  const { password, hostPort, maxConnections, sharedBuffers, resources } = opts
+  const resourcesBlock = composeResourcesBlock(resources)
+  const restart = opts.restart ?? "unless-stopped"
 
   const portsBlock = hostPort ? `\n    ports:\n      - "${hostPort}:5432"` : ""
 
@@ -30,7 +32,7 @@ services:
       - ${dataDir}:/var/lib/postgresql${portsBlock}
     networks:
       - atomservice
-    restart: unless-stopped
+    restart: ${restart}${resourcesBlock}
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s

package/src/postgres.options.ts

@@ -11,16 +11,11 @@ export interface DatabaseConfig {
   extensions?: string[]
 }
 
-export interface PostgresOptions {
-  /**
-   * 实例标识
-   *
-   * - 用于区分不同实例
-   *
-   * @default "default"
-   */
-  id?: string
+import type { BaseServiceOptions } from "@atomservice/core"
+
+export interface PostgresOptions extends BaseServiceOptions {
   /**
+
    * 镜像版本
    *
    * @default "18"