Merge branch 'release/1.36.0' into develop
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
# This file is inspired by https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
|
# This file is inspired by https://github.com/vercel/next.js/blob/canary/examples/with-docker/Dockerfile
|
||||||
|
|
||||||
FROM node:18-alpine AS base
|
FROM node:24-alpine AS base
|
||||||
|
|
||||||
#-----------------------------------------
|
#-----------------------------------------
|
||||||
# STAGE 1: Build the Next.js project
|
# STAGE 1: Build the Next.js project
|
||||||
@@ -27,11 +27,11 @@ RUN npm run build
|
|||||||
#-----------------------------------------
|
#-----------------------------------------
|
||||||
# STAGE 3: Run the Next.js server
|
# STAGE 3: Run the Next.js server
|
||||||
#-----------------------------------------
|
#-----------------------------------------
|
||||||
FROM base as production
|
FROM base AS production
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
ENV NODE_ENV production
|
ENV NODE_ENV=production
|
||||||
|
|
||||||
RUN addgroup --system --gid 1001 nodejs
|
RUN addgroup --system --gid 1001 nodejs
|
||||||
RUN adduser --system --uid 1001 nextjs
|
RUN adduser --system --uid 1001 nextjs
|
||||||
@@ -54,7 +54,7 @@ USER nextjs
|
|||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
|
|
||||||
ENV PORT 3000
|
ENV PORT=3000
|
||||||
|
|
||||||
# server.js is created by next build from the standalone output
|
# server.js is created by next build from the standalone output
|
||||||
# https://nextjs.org/docs/pages/api-reference/next-config-js/output
|
# https://nextjs.org/docs/pages/api-reference/next-config-js/output
|
||||||
|
|||||||
@@ -402,7 +402,7 @@ export const deleteBillById = withUser(async (user:AuthenticatedUser, locationID
|
|||||||
filter: { _id: loc._id, userId },
|
filter: { _id: loc._id, userId },
|
||||||
update: {
|
update: {
|
||||||
$pull: {
|
$pull: {
|
||||||
bills: { name: bill.name }
|
bills: { name: bill.name } as Partial<Bill>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user