Merge pull request #15 from Xenira/dev

ci(build): reduced container and wasm size
Xenira · Jun 5, 2023 · 3327226 · 3327226
2 parents 323f898 + 0f4c170
commit 3327226
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,9 +23,9 @@ RUN cargo chef prepare --recipe-path recipe.json
 FROM trunk AS builder-client
 COPY --from=planner-client /client/recipe.json /client/recipe.json
 COPY ./protocol /protocol
-RUN cargo chef cook --target wasm32-unknown-unknown --recipe-path recipe.json
+RUN cargo chef cook --target wasm32-unknown-unknown --recipe-path recipe.json --release
 COPY ./client /client
-RUN trunk build
+RUN trunk build --release
 
 ##################################################
 # Server
@@ -39,13 +39,15 @@ RUN cd /server && RUSTFLAGS="-C target-feature=-crt-static" cargo build --target
 ##################################################
 # Final Image
 ##################################################
-FROM chef as server
-WORKDIR /usr/local/bin
-RUN apk add libgcc && addgroup -S serveruser && adduser -S serveruser -G serveruser
+FROM chef as composer
 COPY --from=builder-server /server/target/x86_64-unknown-linux-musl/release/rog-server .
 COPY --from=builder-client /client/dist ./static
-COPY --from=builder-client /client/assets ./static/assets
 COPY ./server/static ./static
+
+FROM alpine as server
+WORKDIR /usr/local/bin
+RUN apk update && apk add libgcc libpq-dev && addgroup -S serveruser && adduser -S serveruser -G serveruser
+COPY --from=composer /app/ .
 USER root
 EXPOSE 8000/tcp
 CMD ["rog-server"]
diff --git a/TODO b/TODO
@@ -1,5 +1,7 @@
 Service:
 	☐ Validate display name
+	☐ Opponents need to show player names
+	☐ Reroll button not visible
 	Lobby:
 		☐ Kick Player
 		☐ Promote Player
@@ -98,6 +100,8 @@ Client:
 		Shop:
 			☐ Attach shop to top of screen
 			☐ Attach bench to bottom of screen
+			☐ Add glow to duplicate characters
+			☐ Add glow to characters that can be upgraded
 		Battle:
 			☐ Add battle UI
 			☐ Change target health on animation hit
@@ -121,6 +125,8 @@ Client:
 
 Misc:
 	☐ Intro video
+	☐ Generated art for web container build
+
 
 Hosting:
 	☐ Add preview server

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -33,3 +33,14 @@ dotenv = "0.15.0"
 
 [build-dependencies]
 fs_extra = "1.3.0"
+
+# Enable only a small amount of optimization in debug mode
+[profile.dev]
+opt-level = 1
+
+# Enable high optimizations for dependencies (incl. Bevy), but not for our code:
+[profile.dev.package."*"]
+opt-level = 3
+
+[profile.release]
+lto = "thin"
diff --git a/client/Trunk.toml b/client/Trunk.toml
@@ -0,0 +1,3 @@
+[[hooks]]
+stage = "post_build"
+command = "./cleanup_assets.sh"
diff --git a/client/cleanup_assets.sh b/client/cleanup_assets.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "Removing .txt files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.txt" -type f -delete
+
+echo "Removing .aseprite files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.aseprite" -type f -delete
+
+echo "Removing .xcf files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.xcf" -type f -delete
diff --git a/client/index.html b/client/index.html
@@ -6,6 +6,7 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <link data-trunk rel="copy-dir" href="assets" />
   <link rel="icon" href="data:,">
   <title>space_3</title>
 
@@ -25,7 +26,7 @@
 </head>
 
 <body>
-
+  <link data-trunk rel="rust" data-wasm-opt="s" />
 </body>
 
 </html>