Skip to content

Commit 0a2c836

Browse files
committed
Fix docker build
1 parent 40f1120 commit 0a2c836

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM rust:latest as builder
22
WORKDIR /app
33
COPY . .
4+
ENV SHELL=bash
45
RUN curl -fsSL https://get.pnpm.io/install.sh | sh -
56
# git-fetch-with-cli is a CI bugfix, we should be able to remove it later
67
RUN cargo build --release --bin atomic-server --config net.git-fetch-with-cli=true

server/build.rs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,26 @@ fn should_build() -> bool {
5959
fn main() -> std::io::Result<()> {
6060
println!("cargo:rerun-if-changed=../browser");
6161

62-
let pckgmanager = "pnpm";
62+
let pkg_manager = "pnpm";
6363

6464
if should_build() {
6565
p!("install js packages...");
66-
std::process::Command::new(pckgmanager)
66+
std::process::Command::new(pkg_manager)
6767
.current_dir("../browser/data-browser")
6868
.args(["install"])
6969
.output()
70-
.expect("failed to install deps");
70+
.unwrap_or_else(|_| {
71+
panic!(
72+
"Failed to install js packages. Make sure you have {} installed.",
73+
pkg_manager
74+
)
75+
});
7176
p!("build js assets...");
72-
std::process::Command::new(pckgmanager)
77+
std::process::Command::new(pkg_manager)
7378
.current_dir("../browser/data-browser")
7479
.args(["run", "build"])
7580
.output()
76-
.expect("failed to build js bundle");
81+
.expect("Failed to build js bundle");
7782
}
7883

7984
resource_dir(JS_DIST)

0 commit comments

Comments
 (0)