summaryrefslogtreecommitdiff
path: root/Bastillefile
diff options
context:
space:
mode:
authorAdam T. Carpenter <atc@53hor.net>2021-01-30 17:26:28 -0500
committerAdam T. Carpenter <atc@53hor.net>2021-01-30 17:26:28 -0500
commitca17d5e4d362497fd7e35eb9198a6700b0d85607 (patch)
treed55c1db25a915a77e21c08d6e93654412aeffb37 /Bastillefile
parent7a903d26e61c3e20ca4b0a67ac856dac2a285f1e (diff)
downloadtheglassyladies-ca17d5e4d362497fd7e35eb9198a6700b0d85607.tar.xz
theglassyladies-ca17d5e4d362497fd7e35eb9198a6700b0d85607.zip
pull rust from rustup instead of ports (ports rust cargo can't find
-lsqlite3)
Diffstat (limited to 'Bastillefile')
-rw-r--r--Bastillefile14
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