PNArchives/Memoh
1
0
Fork 0
mirror of https://github.com/memohai/Memoh.git synced 2026-04-25 07:00:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): unify browser image variants

Browse Source
This commit is contained in:
Ran
2026-03-29 02:13:01 +08:00
parent 38afb2e1c6
commit 82714f3f61
7 changed files with 102 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile.browser
+2 -1
View File
@@ -17,7 +17,8 @@ RUN cd apps/browser && bun run build
FROM ubuntu:noble
ENV BROWSER_CORES=chromium,firefox
ARG BROWSER_CORES=chromium,firefox
ENV BROWSER_CORES=${BROWSER_CORES}
WORKDIR /app
docker/Dockerfile.browser-chromium
-41
View File
@@ -1,41 +0,0 @@
# syntax=docker/dockerfile:1
FROM --platform=$BUILDPLATFORM oven/bun:1 AS builder
WORKDIR /build
COPY apps/browser/package.json apps/browser/bun.lock* ./apps/browser/
COPY packages/config/package.json ./packages/config/package.json
RUN echo '{"name":"@memohai/monorepo","private":true,"workspaces":["apps/*","packages/*"]}' > package.json
RUN cd apps/browser && bun install
COPY packages/config/ ./packages/config/
COPY apps/browser/ ./apps/browser/
RUN cd apps/browser && bun run build
FROM ubuntu:noble
ENV BROWSER_CORES=chromium
WORKDIR /app
RUN apt-get update && apt-get install -y unzip curl && \
curl -fsSL https://bun.sh/install | bash && \
ln -s /root/.bun/bin/bun /usr/local/bin/bun && \
apt-get clean && rm -rf /var/lib/apt/lists/*
COPY --from=builder /build/apps/browser/dist /app/dist
COPY --from=builder /build/apps/browser/node_modules /app/node_modules
COPY --from=builder /build/apps/browser/package.json /app/package.json
COPY --from=builder /build/node_modules /node_modules
RUN bun /app/node_modules/.bin/playwright install --with-deps chromium
EXPOSE 8083
HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 \
CMD curl -sf http://127.0.0.1:8083/health || exit 1
CMD ["bun", "run", "dist/index.js"]
docker/Dockerfile.browser-firefox
-41
View File
@@ -1,41 +0,0 @@
# syntax=docker/dockerfile:1
FROM --platform=$BUILDPLATFORM oven/bun:1 AS builder
WORKDIR /build
COPY apps/browser/package.json apps/browser/bun.lock* ./apps/browser/
COPY packages/config/package.json ./packages/config/package.json
RUN echo '{"name":"@memohai/monorepo","private":true,"workspaces":["apps/*","packages/*"]}' > package.json
RUN cd apps/browser && bun install
COPY packages/config/ ./packages/config/
COPY apps/browser/ ./apps/browser/
RUN cd apps/browser && bun run build
FROM ubuntu:noble
ENV BROWSER_CORES=firefox
WORKDIR /app
RUN apt-get update && apt-get install -y unzip curl && \
curl -fsSL https://bun.sh/install | bash && \
ln -s /root/.bun/bin/bun /usr/local/bin/bun && \
apt-get clean && rm -rf /var/lib/apt/lists/*
COPY --from=builder /build/apps/browser/dist /app/dist
COPY --from=builder /build/apps/browser/node_modules /app/node_modules
COPY --from=builder /build/apps/browser/package.json /app/package.json
COPY --from=builder /build/node_modules /node_modules
RUN bun /app/node_modules/.bin/playwright install --with-deps firefox
EXPOSE 8083
HEALTHCHECK --interval=30s --timeout=3s --start-period=10s --retries=3 \
CMD curl -sf http://127.0.0.1:8083/health || exit 1
CMD ["bun", "run", "dist/index.js"]
docker/docker-compose.cn.yml
+1 -5
View File
@@ -10,8 +10,4 @@ services:
web:
image: memoh.cn/memohai/web:latest
browser:
image: memoh.cn/memohai/browser:latest
browser-chromium:
image: memoh.cn/memohai/browser-chromium:latest
browser-firefox:
image: memoh.cn/memohai/browser-firefox:latest
image: memoh.cn/memohai/browser:${BROWSER_TAG:-latest}