pull rust from rustup instead of ports (ports rust cargo can't find

-lsqlite3)

1 files changed, 7 insertions, 7 deletions

diff --git a/Bastillefile b/Bastillefile
index dc70c99..cfec439 100644
--- a/Bastillefile
+++ b/Bastillefile
@@ -1,22 +1,22 @@
 # Dirs and mounts
-CMD mkdir -p /var/db/gl && echo Created /var/db/gl
+CMD mkdir -p /var/db/gl
 FSTAB /zroot/gl /var/db/gl nullfs rw 0 0
 
 # Prereqs
-PKG nginx yarn rust 
+PKG nginx yarn sqlite3
 
 # Download sources
 CMD curl -kf http://192.168.1.50:3000/53hornet/theglassyladies/archive/master.tar.gz -o /tmp/master.tar.gz
 CMD tar -xzvf /tmp/master.tar.gz -C /tmp
 
 # Build backend
-CMD cd /tmp/dichroism
-CMD CARGO_HOME=/tmp cargo install --path .
+#CMD CARGO_HOME=/tmp cargo install --root /usr/local diesel_cli --no-default-features --features sqlite
+CMD curl https://sh.rustup.rs -sSf | sh -s -- -y
+CMD CARGO_HOME=/tmp ~/.cargo/bin/cargo install --root /usr/local --path /tmp/theglassyladies/dichroism
 
 # Build frontend
-CMD cd /tmp/iridescence
-CMD yarn build
-CMD mv dist /var/www
+CMD cd /tmp/theglassyladies/iridescence ; yarn ; yarn build
+CMD mv /tmp/theglassyladies/iridescence/dist /var/www
 
 # Config
 OVERLAY usr