File tree 3 files changed +21
-12
lines changed
3 files changed +21
-12
lines changed Original file line number Diff line number Diff line change 1
- FROM ghcr.io/navigraph/cargo-msfs-bin:latest AS base
1
+ FROM rust:1.84
2
2
3
- RUN apt-get update
4
- RUN apt install git -y
3
+ # Install needed packages and clean up
4
+ RUN apt update && \
5
+ apt install -y --no-install-recommends lsb-release wget software-properties-common gnupg gcc-multilib && \
6
+ rm -rf /var/lib/apt/lists/*
5
7
6
- RUN cargo-msfs install msfs2020
7
- RUN cargo-msfs install msfs2024
8
+ # Install clang and clean up
9
+ RUN wget https://apt.llvm.org/llvm.sh && \
10
+ chmod +x llvm.sh && \
11
+ ./llvm.sh 17 && \
12
+ ln -s $(which clang-17) /usr/bin/clang && \
13
+ ln -s $(which llvm-ar-17) /usr/bin/llvm-ar && \
14
+ rm llvm.sh
8
15
9
- FROM base AS builder
16
+ # Install rust target
17
+ RUN rustup target install wasm32-wasip1
10
18
11
- WORKDIR /external
19
+ # Install cargo-msfs
20
+ RUN cargo install --git https://github.com/navigraph/cargo-msfs
12
21
13
-
14
-
15
- COPY . .
22
+ # Install MSFS2020 and MSFS2024 SDK
23
+ RUN cargo-msfs install msfs2020 && \
24
+ cargo-msfs install msfs2024
Original file line number Diff line number Diff line change @@ -4,4 +4,4 @@ set image="local"
4
4
5
5
cd %~dp0
6
6
7
- docker run --rm -it -v " %cd% \..\:/external" %image% %*
7
+ docker run --rm -it -v " %cd% \..\:/external" -w /external %image% %*
Original file line number Diff line number Diff line change @@ -6,4 +6,4 @@ cd "$(dirname "$0")"
6
6
7
7
echo " Running $@ in docker"
8
8
9
- docker run --rm -v " $( pwd) /../:/external" $IMAGE " $@ "
9
+ docker run --rm -v " $( pwd) /../:/external" -w /external $IMAGE " $@ "
You can’t perform that action at this time.
0 commit comments