From 54afca3221a60235e9556a9fb918759846b96f71 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 30 Jan 2021 18:56:38 -0500 Subject: fixed dichroism build, moved nginx to appropriate dir --- Bastillefile | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'Bastillefile') diff --git a/Bastillefile b/Bastillefile index cfec439..734dcd9 100644 --- a/Bastillefile +++ b/Bastillefile @@ -1,25 +1,32 @@ # Dirs and mounts +PRE mkdir -p /tmp/build +#CMD mkdir -p /tmp/build CMD mkdir -p /var/db/gl FSTAB /zroot/gl /var/db/gl nullfs rw 0 0 # Prereqs -PKG nginx yarn sqlite3 +PKG nginx yarn sqlite3 rust # 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 +CMD curl -kf http://192.168.1.50:3000/53hornet/theglassyladies/archive/master.tar.gz -o /tmp/build/master.tar.gz +CMD tar -xzvf /tmp/build/master.tar.gz -C /tmp/build # Build backend -#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 +CMD CARGO_HOME=/tmp/build SQLITE3_LIB_DIR=/usr/local/lib SQLITE3_INCLUDE_DIR=/usr/local/include cargo install --root /usr/local --path /tmp/build/theglassyladies/dichroism # Build frontend -CMD cd /tmp/theglassyladies/iridescence ; yarn ; yarn build -CMD mv /tmp/theglassyladies/iridescence/dist /var/www +CMD cd /tmp/build/theglassyladies/iridescence ; yarn ; yarn build +CMD mv /tmp/build/theglassyladies/iridescence/dist /var/www # Config OVERLAY usr + +# Launch +CMD cd /var/db/gl ; dichroism SYSRC nginx_enable=YES SERVICE nginx start +# Cleanup +CMD rm -rf /tmp/build +CMD pkg remove -y yarn rust +CMD pkg autoremove -y -- cgit v1.2.3 From 27138be0504ddfa1cf7ad3bf11c920a922452eae Mon Sep 17 00:00:00 2001 From: "Adam T. Carpenter" Date: Sat, 30 Jan 2021 18:58:04 -0500 Subject: PRE -> CMD --- Bastillefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Bastillefile') diff --git a/Bastillefile b/Bastillefile index 734dcd9..fc385b9 100644 --- a/Bastillefile +++ b/Bastillefile @@ -1,6 +1,5 @@ # Dirs and mounts -PRE mkdir -p /tmp/build -#CMD mkdir -p /tmp/build +CMD mkdir -p /tmp/build CMD mkdir -p /var/db/gl FSTAB /zroot/gl /var/db/gl nullfs rw 0 0 -- cgit v1.2.3