From f2e343526e232ed15119f84261e4121ef65c48b5 Mon Sep 17 00:00:00 2001 From: Joseph Shenton Date: Fri, 19 Dec 2025 15:16:32 +1100 Subject: [PATCH] fix: use Ubuntu base for Docker, remove arm64 --- .github/workflows/docker-publish.yml | 2 +- Dockerfile | 32 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 5a68427..02c51f2 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -59,7 +59,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 0ed8b39..4a5a80c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,26 @@ -# Build stage -FROM oven/bun:latest AS base -WORKDIR /app +# Ubuntu base with Bun and FFmpeg +FROM ubuntu:24.04 # Install dependencies -FROM base AS install -COPY package.json bun.lock ./ -RUN bun install --frozen-lockfile --production +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + curl \ + ca-certificates \ + unzip \ + ffmpeg \ + && rm -rf /var/lib/apt/lists/* -# Release stage -FROM base AS release +# Install Bun +RUN curl -fsSL https://bun.sh/install | bash +ENV PATH="/root/.bun/bin:${PATH}" -# Install FFmpeg -RUN apt-get update && \ - apt-get install -y --no-install-recommends ffmpeg && \ - rm -rf /var/lib/apt/lists/* +WORKDIR /app + +# Copy package files +COPY package.json bun.lock ./ -# Copy dependencies -COPY --from=install /app/node_modules ./node_modules +# Install dependencies +RUN bun install --frozen-lockfile --production # Copy source COPY . .