Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
chore: use vite plus base docker image for frontend
Kyle Mendell3830802df388
diff --git a/.depot/workflows/build-next-images.yml b/.depot/workflows/build-next-images.ymlindex 76fb5b1ca..509aa1107 100644--- a/.depot/workflows/build-next-images.yml+++ b/.depot/workflows/build-next-images.yml@@ -58,30 +58,19 @@ jobs:with:configure-docker: true- # - name: Snapshot Setup Environment- # uses: depot/snapshot-action@v1- # with:- # image: g7r5wqb57k.registry.depot.dev/arcane-env:latest-- - name: Login to GitHub Container Registry- uses: docker/login-action@v4- with:- registry: ghcr.io- username: ${{ vars.GHCR_USERNAME }}- password: ${{ secrets.ARCANE_BOT_TOKEN }}-- - name: Login to Quay- uses: docker/login-action@v4- with:- registry: quay.io- username: ${{ secrets.QUAY_USERNAME }}- password: ${{ secrets.QUAY_TOKEN }}-- - name: Login to Docker Hub+ - name: Login to container registriesuses: docker/login-action@v4with:- username: ${{ secrets.DOCKER_USER }}- password: ${{ secrets.DOCKER_PAT }}+ registry-auth: |+ - registry: ghcr.io+ username: ${{ vars.GHCR_USERNAME }}+ password: ${{ secrets.ARCANE_BOT_TOKEN }}+ - registry: quay.io+ username: ${{ secrets.QUAY_USERNAME }}+ password: ${{ secrets.QUAY_TOKEN }}+ - registry: docker.io+ username: ${{ secrets.DOCKER_USER }}+ password: ${{ secrets.DOCKER_PAT }}- name: Compute next image versionid: next-versiondiff --git a/.dockerignore b/.dockerignoreindex 88feeb3ca..9b723b7d8 100644--- a/.dockerignore+++ b/.dockerignore@@ -5,6 +5,7 @@# Build artifactsnode_modules+.pnpm-storebuild.svelte-kitcoverage@@ -52,4 +53,4 @@ pnpm-debug.log**/*.iso**/*.tar**/*.gz-**/*.zip\ No newline at end of file+**/*.zipdiff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex a2c153dd6..bd05614ec 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -14,7 +14,7 @@ permissions:jobs:release:- runs-on: depot-ubuntu-24.04-8+ runs-on: depot-ubuntu-24.04-16env:MANAGER_IMAGE_NAME: ghcr.io/${{ github.repository_owner }}/arcane@@ -43,25 +43,19 @@ jobs:with:configure-docker: true- - name: Login to GHCR+ - name: Login to container registriesuses: docker/login-action@v4with:- registry: ghcr.io- username: ${{ github.repository_owner }}- password: ${{ secrets.GITHUB_TOKEN }}-- - name: Login to Quay- uses: docker/login-action@v4- with:- registry: quay.io- username: ${{ secrets.QUAY_USERNAME }}- password: ${{ secrets.QUAY_TOKEN }}-- - name: Login to Docker Hub- uses: docker/login-action@v4- with:- username: ${{ secrets.DOCKER_USER }}- password: ${{ secrets.DOCKER_PAT }}+ registry-auth: |+ - registry: ghcr.io+ username: ${{ github.repository_owner }}+ password: ${{ secrets.GITHUB_TOKEN }}+ - registry: quay.io+ username: ${{ secrets.QUAY_USERNAME }}+ password: ${{ secrets.QUAY_TOKEN }}+ - registry: docker.io+ username: ${{ secrets.DOCKER_USER }}+ password: ${{ secrets.DOCKER_PAT }}- name: Install Frontend Dependenciesrun: just deps install frontenddiff --git a/docker/Dockerfile b/docker/Dockerfileindex 21a3a6566..12956de5f 100644--- a/docker/Dockerfile+++ b/docker/Dockerfile@@ -3,30 +3,26 @@ ARG BUILD_TAGS=""ARG ARCANE_RUNTIME_BASE_IMAGE=ghcr.io/getarcaneapp/base:distroless# Stage 1: Build Frontend-FROM --platform=$BUILDPLATFORM node:26-trixie-slim AS frontend-builder-RUN npm install -g --force [email protected] && corepack enable-ENV PNPM_HOME="/pnpm"-ENV PATH="$PNPM_HOME:$PATH"+FROM --platform=$BUILDPLATFORM ghcr.io/voidzero-dev/vite-plus:latest AS frontend-builderENV CI=true-WORKDIR /build+WORKDIR /app-COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./-COPY frontend/package.json ./frontend/package.json+COPY --chown=vp:vp pnpm-lock.yaml pnpm-workspace.yaml package.json ./+COPY --chown=vp:vp frontend/package.json ./frontend/package.json-RUN --mount=type=cache,id=arcane-pnpm-v2,target=/pnpm/store,sharing=locked \- pnpm fetch && \- pnpm install -r --offline --frozen-lockfile+RUN --mount=type=cache,id=arcane-pnpm-v3,target=/home/vp/.local/share/pnpm/store,sharing=locked,uid=1000,gid=1000 \+ vp install --frozen-lockfile --prefer-offlineRUN printf 'NODE_VERSION=%s\nSVELTEKIT_VERSION=%s\n' \- "$(node --version)" \- "$(pnpm -C frontend exec node -p 'require("@sveltejs/kit/package.json").version')" \+ "$(vp node --version)" \+ "$(vp -C frontend node -p 'require("@sveltejs/kit/package.json").version')" \> /tmp/arcane-frontend-build.env-COPY frontend ./frontend+COPY --chown=vp:vp frontend ./frontendENV BUILD_PATH=distENV NODE_OPTIONS="--max-old-space-size=4096"-RUN pnpm -C frontend build+RUN vp -C frontend run build# Stage 2: Build BackendFROM --platform=$BUILDPLATFORM golang:1.27-trixie AS backend-builder@@ -51,7 +47,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \COPY backend ./COPY .arcane.json ../arcane.json-COPY --from=frontend-builder /build/frontend/dist ./frontend/dist+COPY --from=frontend-builder /app/frontend/dist ./frontend/distCOPY --from=frontend-builder /tmp/arcane-frontend-build.env /tmp/arcane-frontend-build.envRUN --mount=type=cache,target=/root/.cache/go-build \. /tmp/arcane-frontend-build.env && \diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.devindex 692695dc6..809facfb2 100644--- a/docker/Dockerfile.dev+++ b/docker/Dockerfile.dev@@ -1,34 +1,30 @@# syntax=docker/dockerfile:1# Stage 1: Frontend Development with optimized caching-FROM --platform=$BUILDPLATFORM node:26-trixie-slim AS frontend-dev+FROM --platform=$BUILDPLATFORM ghcr.io/voidzero-dev/vite-plus:latest AS frontend-dev-RUN npm install -g --force corepack && corepack enable pnpm--ENV PNPM_HOME="/pnpm"-ENV PATH="$PNPM_HOME:$PATH"ENV CI=trueWORKDIR /app-# pnpm fetch needs the workspace manifests for offline installs-COPY pnpm-lock.yaml pnpm-workspace.yaml package.json ./-COPY frontend/package.json ./frontend/package.json+# Copy dependency manifests first to preserve the install layer cache+COPY --chown=vp:vp pnpm-lock.yaml pnpm-workspace.yaml package.json ./+COPY --chown=vp:vp frontend/package.json ./frontend/package.json-# Fetch dependencies with cache mount-RUN --mount=type=cache,id=arcane-pnpm-v2,target=/pnpm/store,sharing=locked \- pnpm fetch && \- pnpm install -r --offline --frozen-lockfile+# Install dependencies with a persistent package store cache+RUN mkdir -p /home/vp/.local/share/pnpm/store+RUN --mount=type=cache,id=arcane-pnpm-v3,target=/home/vp/.local/share/pnpm/store,sharing=locked,uid=1000,gid=1000 \+ vp install --frozen-lockfile --prefer-offline# Copy frontend source-COPY frontend ./frontend+COPY --chown=vp:vp frontend ./frontendENV NODE_ENV=development \PORT=3000EXPOSE 3000-CMD ["pnpm", "-C", "frontend", "dev", "--host", "0.0.0.0"]+CMD ["vp", "-C", "frontend", "run", "dev"]# Stage 2: Backend Development with optimized cachingFROM --platform=$BUILDPLATFORM golang:1.27-trixie AS backend-devdiff --git a/docker/compose.dev.yaml b/docker/compose.dev.yamlindex 4775eed5e..94eb4e353 100644--- a/docker/compose.dev.yaml+++ b/docker/compose.dev.yaml@@ -14,7 +14,7 @@ services:- ${HOST_PROJECT_ROOT:-..}/pnpm-lock.yaml:/app/pnpm-lock.yaml:ro- /app/node_modules- /app/frontend/node_modules- - pnpm-cache:/root/.local/share/pnpm/store+ - pnpm-cache:/home/vp/.local/share/pnpm/storeenvironment:- NODE_ENV=development- DEV_BACKEND_URL=http://backend:3552@@ -143,7 +143,7 @@ volumes:name: arcane-go-mod-cachepnpm-cache:- name: arcane-pnpm-cache+ name: arcane-vite-plus-pnpm-cachearcane-builds:name: arcane-builds