@atomservice/redis 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomservice/redis",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Redis 原子服务",
   "type": "module",
   "author": "openorson",
@@ -27,6 +27,6 @@
     ".": "./src/index.ts"
   },
   "peerDependencies": {
-    "@atomservice/core": "0.1.17"
+    "@atomservice/core": "0.1.18"
   }
 }

package/src/redis.compose.ts

@@ -1,4 +1,4 @@
-import { tmpl } from "@atomservice/core"
+import { composeResourcesBlock, tmpl } from "@atomservice/core"
 import { REDIS_CONF_PATH, REDIS_IMAGE } from "./redis.consts.ts"
 import type { RedisOptions } from "./redis.options.ts"
 
@@ -7,9 +7,11 @@ export function redisCompose(
   version: string,
   dataDir: string,
   confPath: string,
-  opts: Pick<RedisOptions, "password" | "hostPort">,
+  opts: Pick<RedisOptions, "password" | "hostPort" | "resources" | "restart">,
 ): string {
-  const { password, hostPort } = opts
+  const { password, hostPort, resources } = opts
+  const resourcesBlock = composeResourcesBlock(resources)
+  const restart = opts.restart ?? "unless-stopped"
 
   const portsBlock = hostPort ? `\n    ports:\n      - "${hostPort}:6379"` : ""
   const authEnv = password ? `\n    environment:\n      - REDISCLI_AUTH=${password}` : ""
@@ -25,7 +27,7 @@ services:
       - ${confPath}:${REDIS_CONF_PATH}:ro${portsBlock}
     networks:
       - atomservice
-    restart: unless-stopped
+    restart: ${restart}${resourcesBlock}
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s

package/src/redis.options.ts

@@ -1,13 +1,8 @@
-export interface RedisOptions {
-  /**
-   * 实例标识
-   *
-   * - 用于区分不同实例
-   *
-   * @default "default"
-   */
-  id?: string
+import type { BaseServiceOptions } from "@atomservice/core"
+
+export interface RedisOptions extends BaseServiceOptions {
   /**
+
    * 镜像版本
    *
    * @default "8"