@atomservice/gitea 0.1.17 → 0.1.19

package/package.json

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

package/src/gitea.compose.ts

@@ -1,4 +1,5 @@
-import { tmpl } from "@atomservice/core"
+import type { ServiceResourcesOptions, ServiceRestartPolicy } from "@atomservice/core"
+import { composeResourcesBlock, tmpl } from "@atomservice/core"
 import { GITEA_IMAGE } from "./gitea.consts.ts"
 
 export interface GiteaComposeOptions {
@@ -6,10 +7,14 @@ export interface GiteaComposeOptions {
   environment?: Record<string, string>
   hostPort?: number
   sshHostPort?: number
+  resources?: ServiceResourcesOptions
+  restart?: ServiceRestartPolicy
 }
 
 export function giteaCompose(id: string, version: string, dataDir: string, opts: GiteaComposeOptions): string {
-  const { rootless, environment, hostPort, sshHostPort } = opts
+  const { rootless, environment, hostPort, sshHostPort, resources, restart: restartOpt } = opts
+  const resourcesBlock = composeResourcesBlock(resources)
+  const restart = restartOpt ?? "unless-stopped"
   const port = 3000
   const uid = 1000
   const gid = 1000
@@ -44,7 +49,7 @@ services:
       - ${dataDir}:${volumeTarget}
     networks:
       - atomservice
-    restart: unless-stopped
+    restart: ${restart}${resourcesBlock}
     healthcheck:
       test: ["CMD", "curl", "-sf", "http://localhost:${port}/api/healthz"]
       interval: 10s

package/src/gitea.options.ts

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

package/src/gitea.service.ts

@@ -49,6 +49,8 @@ export function gitea(opts: GiteaOptions = {}): CallableService<GiteaInstance> {
             environment: opts.environment,
             hostPort: opts.hostPort,
             sshHostPort: opts.sshHostPort,
+            resources: opts.resources,
+            restart: opts.restart,
           }),
         )