Remove unused 'serve' container command

This commit is contained in:
Ben Allfree 2023-12-18 07:44:00 -08:00
parent 28fe796b23
commit f18ac04aad
2 changed files with 8 additions and 23 deletions

View File

@ -67,7 +67,6 @@ global.EventSource = EventSource
const mothership = async () => { const mothership = async () => {
try { try {
const { url, exitCode } = await pbService.spawn({ const { url, exitCode } = await pbService.spawn({
command: 'serve',
version: MOTHERSHIP_SEMVER(), version: MOTHERSHIP_SEMVER(),
name: MOTHERSHIP_NAME(), name: MOTHERSHIP_NAME(),
slug: MOTHERSHIP_NAME(), slug: MOTHERSHIP_NAME(),

View File

@ -17,10 +17,8 @@ import { AsyncReturnType } from 'type-fest'
import { PocketbaseReleaseVersionService } from '../PocketbaseReleaseVersionService' import { PocketbaseReleaseVersionService } from '../PocketbaseReleaseVersionService'
import { buildImage } from './buildImage' import { buildImage } from './buildImage'
export type PocketbaseCommand = 'serve' | 'migrate'
export type Env = { [_: string]: string } export type Env = { [_: string]: string }
export type SpawnConfig = { export type SpawnConfig = {
command: PocketbaseCommand
name: string name: string
slug: string slug: string
version?: string version?: string
@ -79,17 +77,7 @@ export const createPocketbaseService = async (
stdout: new MemoryStream(), stdout: new MemoryStream(),
...cfg, ...cfg,
} }
const { const { version, name, slug, port, extraBinds, env, stderr, stdout } = _cfg
version,
command,
name,
slug,
port,
extraBinds,
env,
stderr,
stdout,
} = _cfg
logger.breadcrumb(name).breadcrumb(slug) logger.breadcrumb(name).breadcrumb(slug)
const iLogger = InstanceLogger(slug, 'exec') const iLogger = InstanceLogger(slug, 'exec')
@ -224,15 +212,13 @@ export const createPocketbaseService = async (
await api.kill() await api.kill()
dbg(`Process ${slug} exited`) dbg(`Process ${slug} exited`)
}) })
if (command === 'serve') { await tryFetch(`${url}/api/health`, {
await tryFetch(`${url}/api/health`, { preflight: async () => {
preflight: async () => { dbg({ stopped, started, container: !!container })
dbg({ stopped, started, container: !!container }) if (stopped) throw new Error(`Container stopped`)
if (stopped) throw new Error(`Container stopped`) return started && !!container
return started && !!container },
}, })
})
}
const api: PocketbaseProcess = { const api: PocketbaseProcess = {
url, url,
pid: () => { pid: () => {