diff --git a/Dockerfile b/Dockerfile index 8080b1f1..85c8aaba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM ghcr.io/plankanban/planka:base-latest as server-dependencies WORKDIR /app COPY server/package.json server/package-lock.json . - +COPY . ./source-code RUN npm install npm@latest --global \ && npm install pnpm --global \ && pnpm install --prod @@ -33,13 +33,13 @@ COPY --chown=node:node server . RUN mv .env.sample .env COPY --from=server-dependencies --chown=node:node /app/node_modules node_modules +COPY --from=server-dependencies --chown=node:node /app/source-code /app/src COPY --from=client --chown=node:node /app/build public COPY --from=client --chown=node:node /app client COPY --from=client --chown=node:node /app/build/index.html views/index.ejs - VOLUME /app/public/user-avatars VOLUME /app/public/project-background-images VOLUME /app/private/attachments diff --git a/client/package-lock.json b/client/package-lock.json index 3af352ee..6883acc3 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -23279,16 +23279,16 @@ } }, "node_modules/typescript": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", - "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=4.2.0" } }, "node_modules/typescript-compare": { diff --git a/server/utils/mail.js b/server/utils/mail.js index 0e2fbb61..aae333ab 100644 --- a/server/utils/mail.js +++ b/server/utils/mail.js @@ -28,8 +28,8 @@ const sendEmail = async ({ to, subject, text, cc }) => { } }; -const sendUserEmails = async ({ ids, subject, text, cc }) => { - const users = await sails.helpers.users.getMany(ids); +const sendUserEmails = async ({ to, subject, text, cc }) => { + const users = await sails.helpers.users.getMany({ id: { in: to } }); return sendEmail({ to: users.map((u) => u.email), subject, text, cc }); };