Merge pull request #16 from Xenira/dev

ci(build): fixed generated assets not beeing included

Dockerfile

@@ -40,9 +40,9 @@ RUN cd /server && RUSTFLAGS="-C target-feature=-crt-static" cargo build --target
 # Final Image
 ##################################################
 FROM chef as composer
+COPY ./server/static ./static
 COPY --from=builder-server /server/target/x86_64-unknown-linux-musl/release/rog-server .
 COPY --from=builder-client /client/dist ./static
-COPY ./server/static ./static
 
 FROM alpine as server
 WORKDIR /usr/local/bin

client/Trunk.toml

@@ -1,3 +1,3 @@
 [[hooks]]
 stage = "post_build"
-command = "./cleanup_assets.sh"
+command = "./process_assets.sh"

client/index.html

@@ -6,7 +6,6 @@
   <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>
 

client/process_assets.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cp -r $TRUNK_SOURCE_DIR/assets $TRUNK_STAGING_DIR/assets
+
+echo "Removing .txt files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.txt" -type f -delete -print
+
+echo "Removing .json files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.json" -type f -delete -print
+
+echo "Removing .aseprite files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.aseprite" -type f -delete -print
+
+echo "Removing .xcf files from $TRUNK_STAGING_DIR"
+find $TRUNK_STAGING_DIR -name "*.xcf" -type f -delete -print