Browse Source

Fix Dockerfile

Vecna 7 months ago
parent
commit
289b6e81cc
1 changed files with 15 additions and 3 deletions
  1. 15 3
      Dockerfile

+ 15 - 3
Dockerfile

@@ -6,7 +6,17 @@ COPY setup_files/* /home/user/build/
 RUN sed -i 's@HOMEDIR@/home/user@g' /home/user/build/config.toml
 
 RUN apt update -y
-RUN apt install -y git cargo golang make openssl libssl-dev
+
+# git for cloning repos
+# cargo for building everything except rdsys
+# golang and make for building rdsys
+# openssl and libssl-dev as dependencies for (building) the software
+#
+# psmisc for killing processes after simulation completes
+#   (killall -s INT rdsys lox-distributor troll-patrol)
+# time for collecting performance stats on rdsys
+#   (other code uses a Rust crate for this)
+RUN apt install -y git cargo golang make openssl libssl-dev psmisc time
 
 RUN mkdir -p /home/user/build /home/user/rdsys /home/user/lox-distributor /home/user/troll-patrol /home/user/simulation
 
@@ -58,11 +68,13 @@ RUN cp /home/user/build/config.toml .cargo/
 # Build rdsys and bridge lines
 WORKDIR /home/user/build/rdsys
 RUN make build && make descriptors
-RUN cp -r backend conf descriptors /home/user/rdsys/
+RUN cp -r conf descriptors /home/user/rdsys/
+# Copy backend executable as "rdsys"
+RUN cp backend /home/user/rdsys/rdsys
 
 # Build Lox distributor
 WORKDIR /home/user/build/lox/crates/lox-distributor
-RUN cargo update && cargo build --release
+RUN cargo update && cargo build --release --features simulation
 RUN cp config.json /home/user/build/lox/target/release/lox-distributor /home/user/lox-distributor/
 
 # Build Troll Patrol