From f18ac04aad75e84f95cd223e7e23c776f3a778a3 Mon Sep 17 00:00:00 2001 From: Ben Allfree Date: Mon, 18 Dec 2023 07:44:00 -0800 Subject: [PATCH] Remove unused 'serve' container command --- src/server.ts | 1 - src/services/PocketBaseService/index.ts | 30 +++++++------------------ 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/server.ts b/src/server.ts index 23bab2ec..e3f838a2 100644 --- a/src/server.ts +++ b/src/server.ts @@ -67,7 +67,6 @@ global.EventSource = EventSource const mothership = async () => { try { const { url, exitCode } = await pbService.spawn({ - command: 'serve', version: MOTHERSHIP_SEMVER(), name: MOTHERSHIP_NAME(), slug: MOTHERSHIP_NAME(), diff --git a/src/services/PocketBaseService/index.ts b/src/services/PocketBaseService/index.ts index b1ea13b2..d6cd570a 100644 --- a/src/services/PocketBaseService/index.ts +++ b/src/services/PocketBaseService/index.ts @@ -17,10 +17,8 @@ import { AsyncReturnType } from 'type-fest' import { PocketbaseReleaseVersionService } from '../PocketbaseReleaseVersionService' import { buildImage } from './buildImage' -export type PocketbaseCommand = 'serve' | 'migrate' export type Env = { [_: string]: string } export type SpawnConfig = { - command: PocketbaseCommand name: string slug: string version?: string @@ -79,17 +77,7 @@ export const createPocketbaseService = async ( stdout: new MemoryStream(), ...cfg, } - const { - version, - command, - name, - slug, - port, - extraBinds, - env, - stderr, - stdout, - } = _cfg + const { version, name, slug, port, extraBinds, env, stderr, stdout } = _cfg logger.breadcrumb(name).breadcrumb(slug) const iLogger = InstanceLogger(slug, 'exec') @@ -224,15 +212,13 @@ export const createPocketbaseService = async ( await api.kill() dbg(`Process ${slug} exited`) }) - if (command === 'serve') { - await tryFetch(`${url}/api/health`, { - preflight: async () => { - dbg({ stopped, started, container: !!container }) - if (stopped) throw new Error(`Container stopped`) - return started && !!container - }, - }) - } + await tryFetch(`${url}/api/health`, { + preflight: async () => { + dbg({ stopped, started, container: !!container }) + if (stopped) throw new Error(`Container stopped`) + return started && !!container + }, + }) const api: PocketbaseProcess = { url, pid: () => {