Skip to content

Commit 5f42870

Browse files
committed
Fix docker build
1 parent 013410b commit 5f42870

File tree

4 files changed

+12
-45
lines changed

4 files changed

+12
-45
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
target
22
Dockerfile
33
dockerfile
4+
browser/node_modules
45
.dockerignore
56
.env
67
.git

browser/debug.log

Lines changed: 0 additions & 18 deletions
This file was deleted.

browser/lerna-debug.log

Lines changed: 0 additions & 21 deletions
This file was deleted.

dockerfile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
FROM node:20 as js-builder
2+
WORKDIR /app/browser
3+
ENV SHELL=bash
4+
RUN npm install -g pnpm
5+
COPY browser/package.json browser/pnpm-lock.yaml ./
6+
RUN pnpm install -r --frozen-lockfile
7+
COPY ./browser .
8+
RUN pnpm install -r --frozen-lockfile
9+
RUN pnpm build
10+
111
FROM rust:latest as builder
212
WORKDIR /app
313
COPY . .
4-
ENV SHELL=bash
5-
# Install PNPM, source it and build the JS assets
6-
RUN curl -fsSL https://get.pnpm.io/install.sh | sh -
7-
RUN . /root/.bashrc
8-
RUN cd browser && pnpm install && pnpm run build
9-
RUN cd ..
14+
COPY --from=js-builder /app/browser/data-browser/dist /app/browser/data-browser/dist
1015
# git-fetch-with-cli is a CI bugfix, we should be able to remove it later
1116
RUN cargo build --release --bin atomic-server --config net.git-fetch-with-cli=true
1217

0 commit comments

Comments
 (0)