diff options
| author | Adam T. Carpenter <atc@53hor.net> | 2021-01-31 11:45:04 -0500 |
|---|---|---|
| committer | Adam T. Carpenter <atc@53hor.net> | 2021-01-31 11:45:04 -0500 |
| commit | d3e2b24d94d7566241c19557b0a2cbaf0ad6a257 (patch) | |
| tree | 37275fe91d560b7a82333e00ddd88a853bbdbd55 | |
| parent | 985f35b3e92de36bbb651c934fb74cb7cb42b056 (diff) | |
| parent | 27138be0504ddfa1cf7ad3bf11c920a922452eae (diff) | |
| download | theglassyladies-d3e2b24d94d7566241c19557b0a2cbaf0ad6a257.tar.xz theglassyladies-d3e2b24d94d7566241c19557b0a2cbaf0ad6a257.zip | |
Merge branch 'master' of http://192.168.1.50:3000/macon-bastille/theglassyladies
| -rw-r--r-- | Bastillefile | 22 | ||||
| -rw-r--r-- | usr/local/etc/nginx/nginx.conf (renamed from nginx.conf) | 0 |
2 files changed, 14 insertions, 8 deletions
diff --git a/Bastillefile b/Bastillefile index cfec439..fc385b9 100644 --- a/Bastillefile +++ b/Bastillefile @@ -1,25 +1,31 @@ # Dirs and mounts +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 diff --git a/nginx.conf b/usr/local/etc/nginx/nginx.conf index 555f7e0..555f7e0 100644 --- a/nginx.conf +++ b/usr/local/etc/nginx/nginx.conf |