diff --git a/.dockerignore b/.dockerignore index 9976e9e..ca2359f 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,20 +1,19 @@ -.dockerignore -.editorconfig -.env -.git -.gitignore -.idea -.vscode -CHANGELOG.md -coverage* -data -docker-compose* -Dockerfile* -eslint.config.js -helm-charts -LICENSE -Makefile -node_modules -prettier.config.js -README.md +.dockerignore +.editorconfig +.env +.git +.idea +.vscode +CHANGELOG.md +coverage* +data +docker-compose* +Dockerfile* +eslint.config.js +helm-charts +LICENSE +Makefile +node_modules +prettier.config.js +README.md renovate.json \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 55770f7..c6ea422 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,12 @@ WORKDIR /app # this will cache them and speed up future builds FROM base AS install RUN mkdir -p /temp/dev -COPY package.json bun.lockb /temp/dev/ +COPY package.json bun.lock /temp/dev/ RUN cd /temp/dev && bun install --frozen-lockfile # install with --production (exclude devDependencies) RUN mkdir -p /temp/prod -COPY package.json bun.lockb /temp/prod/ +COPY package.json bun.lock /temp/prod/ RUN cd /temp/prod && bun install --frozen-lockfile --production FROM base AS builder @@ -22,13 +22,13 @@ RUN cargo install resvg # copy node_modules from temp directory # then copy all (non-ignored) project files into the image -FROM base AS prerelease +# will switch to alpine again when it works +FROM oven/bun:1.2.2-slim AS prerelease +WORKDIR /app COPY --from=install /temp/dev/node_modules node_modules COPY . . -# # [optional] tests & build -ENV NODE_ENV=production -# RUN bun test +# ENV NODE_ENV=production RUN bun run build # copy production dependencies and source code into final image