dsh-plugin-container 0.3.1 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-container",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "private": false,
   "description": "DSH sidebar container panel for macOS Docker runtimes and Apple container",
   "type": "module",
@@ -41,8 +41,7 @@
     "prepack": "npm run build && npm test"
   },
   "devDependencies": {
-    "esbuild": "0.25.0",
-    "@deepseek-ai/dsh-tools": "^0.2.1-rc.5"
+    "esbuild": "0.25.0"
   },
   "license": "MIT",
   "keywords": [
@@ -68,5 +67,8 @@
   "bugs": {
     "url": "https://github.com/Zaynervewreck/dsh-plugin-container/issues"
   },
-  "author": "Zaynervewreck"
+  "author": "Zaynervewreck",
+  "dependencies": {
+    "@deepseek-ai/dsh-tools": "^0.2.1-rc.5"
+  }
 }

package/src/client/build-image.jsx

@@ -0,0 +1,119 @@
+/** Build a Docker/Apple image from a Dockerfile. */
+import { useEffect, useState } from 'react'
+
+import { Button, Modal } from './components.jsx'
+
+const IMAGE_REF = /^[A-Za-z0-9][A-Za-z0-9_.:/@-]*$/u
+
+export default function BuildImageDialog({ open, t, provider, cwd, onClose, onSubmit }) {
+  const [tag, setTag] = useState('')
+  const [contextPath, setContextPath] = useState('')
+  const [dockerfile, setDockerfile] = useState('Dockerfile')
+  const [noCache, setNoCache] = useState(false)
+  const [error, setError] = useState(null)
+  const [busy, setBusy] = useState(false)
+
+  useEffect(() => {
+    if (!open) return
+    setTag('')
+    setContextPath(cwd || '')
+    setDockerfile('Dockerfile')
+    setNoCache(false)
+    setError(null)
+    setBusy(false)
+  }, [open, cwd])
+
+  const close = () => {
+    if (busy) return
+    onClose()
+  }
+
+  const submit = async (event) => {
+    event?.preventDefault()
+    const imageTag = tag.trim()
+    const context = contextPath.trim()
+    if (!IMAGE_REF.test(imageTag)) {
+      setError(t('buildInvalidTag'))
+      return
+    }
+    if (!context.startsWith('/')) {
+      setError(t('buildInvalidContext'))
+      return
+    }
+    setBusy(true)
+    setError(null)
+    try {
+      await onSubmit({
+        kind: 'image',
+        action: 'build',
+        tag: imageTag,
+        contextPath: context,
+        dockerfile: dockerfile.trim() === '' ? undefined : dockerfile.trim(),
+        noCache,
+      })
+      setBusy(false)
+      onClose()
+    } catch (submitError) {
+      setError(submitError instanceof Error ? submitError.message : String(submitError))
+      setBusy(false)
+    }
+  }
+
+  return (
+    <Modal
+      open={open}
+      title={t('buildImageTitle')}
+      subtitle={provider === 'apple-container' ? t('providerApple') : t('providerDocker')}
+      onClose={close}
+      closeLabel={t('close')}
+      footer={
+        <>
+          <Button size="sm" variant="ghost" onClick={close} disabled={busy}>{t('modalCancel')}</Button>
+          <Button size="sm" variant="primary" onClick={submit} disabled={busy}>
+            {busy ? t('starting') : t('buildStart')}
+          </Button>
+        </>
+      }
+    >
+      <form className="dsh-docker-run-form" onSubmit={submit}>
+        <label className="dsh-docker-field">
+          <span>{t('buildTag')}</span>
+          <input
+            className="dsh-docker-input"
+            value={tag}
+            onChange={(event) => setTag(event.target.value)}
+            placeholder="my-app:latest"
+            spellCheck="false"
+            autoFocus
+          />
+        </label>
+        <label className="dsh-docker-field">
+          <span>{t('buildContext')}</span>
+          <input
+            className="dsh-docker-input"
+            value={contextPath}
+            onChange={(event) => setContextPath(event.target.value)}
+            placeholder="/Users/me/project"
+            spellCheck="false"
+          />
+          <small className="dsh-docker-muted">{t('buildContextHint')}</small>
+        </label>
+        <label className="dsh-docker-field">
+          <span>{t('buildDockerfile')}</span>
+          <input
+            className="dsh-docker-input"
+            value={dockerfile}
+            onChange={(event) => setDockerfile(event.target.value)}
+            placeholder="Dockerfile"
+            spellCheck="false"
+          />
+        </label>
+        <label className="dsh-docker-check">
+          <input type="checkbox" checked={noCache} onChange={(event) => setNoCache(event.target.checked)} />
+          {t('buildNoCache')}
+        </label>
+        {error !== null && <div className="dsh-docker-form-error">{error}</div>}
+      </form>
+    </Modal>
+  )
+}

package/src/client/i18n.js

@@ -117,6 +117,17 @@ export const zh = {
   removeNetwork: '删除网络',
   pull: '拉取',
   pullPlaceholder: 'nginx:latest',
+  pushImage: '推送镜像',
+  buildImage: '构建镜像',
+  buildImageTitle: '构建镜像',
+  buildTag: '镜像标签',
+  buildContext: '构建上下文（绝对路径）',
+  buildContextHint: '例如 /Users/me/project，必须包含 Dockerfile。',
+  buildDockerfile: 'Dockerfile',
+  buildNoCache: '不使用构建缓存',
+  buildStart: '开始构建',
+  buildInvalidTag: '请输入合法的镜像标签，例如 my-app:latest',
+  buildInvalidContext: '构建上下文必须是绝对路径',
   pullAction: '拉取镜像',
   emptyContainers: '没有容器',
   emptyImages: '没有镜像',
@@ -363,6 +374,17 @@ export const en = {
   removeNetwork: 'Remove network',
   pull: 'Pull',
   pullPlaceholder: 'nginx:latest',
+  pushImage: 'Push image',
+  buildImage: 'Build image',
+  buildImageTitle: 'Build image',
+  buildTag: 'Image tag',
+  buildContext: 'Build context (absolute path)',
+  buildContextHint: 'For example /Users/me/project; it must contain the Dockerfile.',
+  buildDockerfile: 'Dockerfile',
+  buildNoCache: 'Disable build cache',
+  buildStart: 'Build',
+  buildInvalidTag: 'Enter a valid image tag, for example my-app:latest',
+  buildInvalidContext: 'Build context must be an absolute path',
   pullAction: 'Pull image',
   emptyContainers: 'No containers',
   emptyImages: 'No images',

package/src/client/icons.jsx

@@ -214,6 +214,20 @@ export const IconExec = (props) => (
   </Svg>
 )
 
+export const IconUpload = (props) => (
+  <Svg {...props}>
+    <path d="M12 16V4M7.5 8.5 12 4l4.5 4.5" />
+    <path d="M5 15v3.5A1.5 1.5 0 0 0 6.5 20h11a1.5 1.5 0 0 0 1.5-1.5V15" />
+  </Svg>
+)
+
+export const IconBuild = (props) => (
+  <Svg {...props}>
+    <path d="M14.5 5.5 18.5 9.5M4 20l4.2-1 10.9-10.9a2.1 2.1 0 0 0-3-3L5.2 16 4 20Z" />
+    <path d="m13.2 6.8 4 4" />
+  </Svg>
+)
+
 export const IconAttach = (props) => (
   <Svg {...props}>
     <path d="M9.5 14.5 14.5 9.5" />

package/src/client/styles.js

@@ -220,6 +220,7 @@ const CSS = `
 .dsh-docker-field > span { font-size: 11.5px; color: var(--dsw-alias-label-secondary, #60636c); }
 .dsh-docker-textarea { height: auto; min-height: 72px; padding: 8px 10px; resize: vertical; font-family: var(--dsw-font-markdown-code-font-family, ui-monospace, Menlo, monospace); line-height: 1.5; }
 .dsh-docker-form-error { color: var(--dsw-alias-label-error, #d33c3c); font-size: 12px; }
+.dsh-docker-check { display: flex; align-items: center; gap: 7px; font-size: 12px; color: var(--dsw-alias-label-secondary, #60636c); }
 
 
 .dsh-docker-table-wrap { overflow: auto; border-radius: 0 0 11px 11px; }

package/src/client/tabs/images.jsx

@@ -11,15 +11,17 @@ import {
   displayValue,
   shortId,
 } from '../components.jsx'
+import BuildImageDialog from '../build-image.jsx'
 import { useDockerList } from '../hooks.js'
-import { IconAlert, IconImage, IconInfo, IconPlay, IconTrash, IconDownload } from '../icons.jsx'
+import { IconAlert, IconBuild, IconDownload, IconImage, IconInfo, IconPlay, IconTrash, IconUpload } from '../icons.jsx'
 
 const IMAGE_REF = /^[A-Za-z0-9][A-Za-z0-9_.:/@-]*$/u
 
-export default function ImagesTab({ t, api, provider, context, status, refreshToken, features = [], onAction, onRunContainer, onInspect, onNotify }) {
+export default function ImagesTab({ t, api, provider, context, status, refreshToken, features = [], cwd, onAction, onRunContainer, onInspect, onNotify }) {
   const showArchitecture = features.includes('image-architecture')
   const [search, setSearch] = useState('')
   const [pull, setPull] = useState('')
+  const [buildOpen, setBuildOpen] = useState(false)
   const enabled = status?.daemon?.state === 'running'
   const list = useDockerList(api, provider, 'images', context, { refreshToken, enabled })
   const items = list.data?.items ?? []
@@ -61,6 +63,9 @@ export default function ImagesTab({ t, api, provider, context, status, refreshTo
         <div className="dsh-docker-toolbar-right">
           <span className="dsh-docker-muted">{filtered.length} / {items.length}</span>
           {!showArchitecture && <span className="dsh-docker-muted">{t('restartForArchitecture')}</span>}
+          {features.includes('image-build') && (
+            <Button size="sm" onClick={() => setBuildOpen(true)}><IconBuild size={13} /> {t('buildImage')}</Button>
+          )}
           <Button size="sm" onClick={list.reload} disabled={list.loading}>{t('refresh')}</Button>
         </div>
       </div>
@@ -106,6 +111,11 @@ export default function ImagesTab({ t, api, provider, context, status, refreshTo
                             <IconPlay size={14} />
                           </IconButton>
                         )}
+                        {features.includes('image-push') && item.name !== '<none>' && (
+                          <IconButton size="sm" label={t('pushImage')} onClick={() => onAction({ kind: 'image', action: 'push', id: item.name }, { focusConsole: true })}>
+                            <IconUpload size={14} />
+                          </IconButton>
+                        )}
                         <IconButton size="sm" label={t('inspect')} onClick={() => onInspect('image', inspectId)}>
                           <IconInfo size={14} />
                         </IconButton>
@@ -122,6 +132,17 @@ export default function ImagesTab({ t, api, provider, context, status, refreshTo
           </div>
         </section>
       )}
+
+      <BuildImageDialog
+        open={buildOpen}
+        t={t}
+        provider={provider}
+        cwd={cwd}
+        onClose={() => setBuildOpen(false)}
+        onSubmit={async (input) => {
+          await onAction(input, { focusConsole: true })
+        }}
+      />
     </div>
   )
 }

package/src/host/apple.js

@@ -397,6 +397,20 @@ export class AppleProvider {
       if (action === 'pull') {
         return this.run({ argv: ['image', 'pull', safeImageRef(payload.id ?? payload.reference)], cwd: payload.cwd, title: payload.title ?? 'container image pull' }, signal)
       }
+      if (action === 'push') {
+        return this.run({ argv: ['image', 'push', safeImageRef(payload.id ?? payload.reference)], cwd: payload.cwd, title: payload.title ?? 'container image push' }, signal)
+      }
+      if (action === 'build') {
+        const tag = safeImageRef(payload.tag)
+        const contextPath = resolveCwd(payload.contextPath === undefined ? this.home : requireString(payload.contextPath, 'contextPath'), { fallback: this.home, statSync })
+        const dockerfile = payload.dockerfile === undefined || payload.dockerfile === null ? undefined : requireString(payload.dockerfile, 'dockerfile')
+        if (dockerfile !== undefined && (dockerfile.includes('\0') || dockerfile.startsWith('-') || dockerfile.length > 4096)) throw new CommandError('Dockerfile 路径不合法')
+        const argv = ['build', '--progress', 'plain', '-t', tag]
+        if (dockerfile !== undefined && dockerfile !== '') argv.push('-f', dockerfile)
+        if (payload.noCache === true) argv.push('--no-cache')
+        argv.push(contextPath)
+        return this.run({ argv, cwd: contextPath, timeoutMs: payload.timeoutMs ?? 15 * 60_000, title: payload.title ?? `container build ${tag}` }, signal)
+      }
       if (action === 'delete') {
         return this.run({ argv: ['image', 'delete', safeId(payload.id)], confirm: payload.confirm, cwd: payload.cwd, title: payload.title ?? 'container image delete' }, signal)
       }

package/src/host/service.js

@@ -256,7 +256,7 @@ export class DockerService {
     }
     providers.push(await this.apple.info(signal))
     const defaultProvider = providers.find((provider) => provider.id === 'docker' && provider.available)?.id ?? providers.find((provider) => provider.available)?.id ?? 'docker'
-    const features = ['attach', 'exec', 'run', 'image-architecture']
+    const features = ['attach', 'exec', 'run', 'image-architecture', 'image-push', 'image-build']
     if (this.toolsEnabled) features.push('ai-tools')
     return { providers, defaultProvider, features }
   }
@@ -736,6 +736,25 @@ export class DockerService {
         title: payload.title ?? `启动容器 ${image}`,
       }, signal)
     }
+    if (kind === 'image' && action === 'build') {
+      const tag = safeImageRef(payload.tag)
+      const contextPath = resolveCwd(optionalString(payload.contextPath, 'contextPath') ?? this.home, { fallback: this.home, statSync })
+      const dockerfile = optionalString(payload.dockerfile, 'dockerfile')
+      if (dockerfile !== undefined && (dockerfile.includes('\0') || dockerfile.startsWith('-') || dockerfile.length > 4096)) {
+        throw new CommandError('Dockerfile 路径不合法')
+      }
+      const argv = ['build', '--progress', 'plain', '-t', tag]
+      if (dockerfile !== undefined && dockerfile !== '') argv.push('-f', dockerfile)
+      if (payload.noCache === true) argv.push('--no-cache')
+      argv.push(contextPath)
+      return this.run({
+        argv,
+        context: payload.context,
+        cwd: contextPath,
+        timeoutMs: payload.timeoutMs ?? 15 * 60_000,
+        title: payload.title ?? `构建镜像 ${tag}`,
+      }, signal)
+    }
     const id = safeIdentifier(payload.id ?? payload.reference)
     let argv
     if (kind === 'container') {
@@ -746,6 +765,7 @@ export class DockerService {
       else if (action === 'logs') argv = ['logs', '--tail', payload.follow === true ? '100' : '500', ...(payload.follow === true ? ['-f'] : []), id]
     } else if (kind === 'image') {
       if (action === 'pull') argv = ['pull', id]
+      else if (action === 'push') argv = ['push', id]
       else if (action === 'delete') argv = ['rmi', id]
     } else if (kind === 'volume' && action === 'delete') {
       argv = ['volume', 'rm', id]