From e73ee0f2a141df8f1accbb723fc6318c9fdbcd4c Mon Sep 17 00:00:00 2001
From: TrainDoctor <traindoctor@protonmail.com>
Date: Tue, 23 Aug 2022 12:26:43 -0700
Subject: [PATCH] Changed entrypoint.sh to run cargo rather than cross

---
 .gitignore            | 2 ++
 backend/Dockerfile    | 8 +-------
 backend/build.sh      | 4 ++--
 backend/entrypoint.sh | 4 +++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa2d529..565b24f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ yalc.lock
 # ignore Rust compiler files
 /backend-rs/target
 /bin/backend
+/backend/target
+/backend/out
 
 # packaged teasers
 *.zip
diff --git a/backend/Dockerfile b/backend/Dockerfile
index f46e170..f1a0ed3 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -1,9 +1,3 @@
-# we support images for building with a vanilla SteamOS base,
-# or versions with ootb support for rust or go
-# developers can also customize these images via this Dockerfile
-#FROM ghcr.io/steamdeckhomebrew/holo-toolchain-rust:latest
-#FROM ghcr.io/steamdeckhomebrew/holo-toolchain-go:latest
-FROM ghcr.io/steamdeckhomebrew/holo-base:latest
+FROM ghcr.io/steamdeckhomebrew/holo-toolchain-rust:latest
 
-# entrypoint.sh should always be located in the backend folder
 ENTRYPOINT [ "/backend/entrypoint.sh" ]
\ No newline at end of file
diff --git a/backend/build.sh b/backend/build.sh
index 9f60798..c939bde 100755
--- a/backend/build.sh
+++ b/backend/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 cross build --release
-mkdir ../bin
-cp ./target/release/fantastic-rs ../bin/backend
+mkdir out
+cp ./target/release/fantastic-rs out/backend
diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh
index af04d23..72b2a00 100755
--- a/backend/entrypoint.sh
+++ b/backend/entrypoint.sh
@@ -5,4 +5,6 @@ echo "Container's IP address: `awk 'END{print $1}' /etc/hosts`"
 
 cd /backend
 
-make
\ No newline at end of file
+cargo build --release
+mkdir -p out
+cp target/release/fantastic-rs out/backend
\ No newline at end of file