watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-04 04:37:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Dockerfile tweaks.

Browse source
This commit is contained in:
Mike Cao 2025-04-24 19:23:10 -07:00
parent 0fd2d09dba
commit 340cdce1dc
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Dockerfile
View file

@ -21,8 +21,7 @@ ENV BASE_PATH=$BASE_PATH
ENV NEXT_TELEMETRY_DISABLED=1 ENV NEXT_TELEMETRY_DISABLED=1
RUN npm install -g pnpm RUN npm run build-docker
RUN pnpm build-docker
# Production image, copy all the files and run next # Production image, copy all the files and run next
FROM node:22-alpine AS runner FROM node:22-alpine AS runner
@ -39,10 +38,13 @@ RUN adduser --system --uid 1001 nextjs
RUN npm install -g pnpm RUN npm install -g pnpm
RUN set -x \ RUN set -x \
&& apk add --no-cache curl \ && apk add --no-cache curl
&& pnpm add npm-run-all dotenv prisma@6.1.0
RUN chown -R nextjs:nodejs node_modules/ # Script dependencies
RUN pnpm add npm-run-all dotenv prisma@6.1.0
# Permissions for prisma
RUN chown -R nextjs:nodejs node_modules/.pnpm/
COPY --from=builder --chown=nextjs:nodejs /app/public ./public COPY --from=builder --chown=nextjs:nodejs /app/public ./public
COPY --from=builder /app/prisma ./prisma COPY --from=builder /app/prisma ./prisma
@ -53,6 +55,7 @@ COPY --from=builder /app/scripts ./scripts
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
# Custom routes
RUN mv ./.next/routes-manifest.json ./.next/routes-manifest-orig.json RUN mv ./.next/routes-manifest.json ./.next/routes-manifest-orig.json
USER nextjs USER nextjs

10
scripts/set-routes-manifest.js
View file

@ -17,7 +17,7 @@ const headers = [];
const rewrites = []; const rewrites = [];
if (collectApiEndpoint) { if (collectApiEndpoint) {
const apiRoute = originalManifest.headers.find((route) => route.source === API_PATH); const apiRoute = originalManifest.headers.find(route => route.source === API_PATH);
const routeRegex = new RegExp(apiRoute.regex); const routeRegex = new RegExp(apiRoute.regex);
rewrites.push({ rewrites.push({
@ -34,7 +34,7 @@ if (collectApiEndpoint) {
} }
if (trackerScriptName) { if (trackerScriptName) {
const trackerRoute = originalManifest.headers.find((route) => route.source === TRACKER_SCRIPT); const trackerRoute = originalManifest.headers.find(route => route.source === TRACKER_SCRIPT);
const names = trackerScriptName?.split(',').map(name => name.trim()); const names = trackerScriptName?.split(',').map(name => name.trim());
@ -57,11 +57,11 @@ if (trackerScriptName) {
const routesManifest = { ...originalManifest }; const routesManifest = { ...originalManifest };
if (rewrites.length != 0) { if (rewrites.length !== 0) {
const { buildCustomRoute } = require('next/dist/lib/build-custom-route'); const { buildCustomRoute } = require('next/dist/lib/build-custom-route');
const builtHeaders = headers.map((header) => buildCustomRoute('header', header)); const builtHeaders = headers.map(header => buildCustomRoute('header', header));
const builtRewrites = rewrites.map((rewrite) => buildCustomRoute('rewrite', rewrite)); const builtRewrites = rewrites.map(rewrite => buildCustomRoute('rewrite', rewrite));
routesManifest.headers = [...originalManifest.headers, ...builtHeaders]; routesManifest.headers = [...originalManifest.headers, ...builtHeaders];
routesManifest.rewrites = [...builtRewrites, ...originalManifest.rewrites]; routesManifest.rewrites = [...builtRewrites, ...originalManifest.rewrites];