From 81a72578a1f0a03602b6f281abca7cdff6fd1566 Mon Sep 17 00:00:00 2001
From: Rohan Sircar <rohansircar@tuta.io>
Date: Tue, 27 Apr 2021 16:52:27 +0530
Subject: [PATCH] make app docker volume friendly

---
 .env             |   2 +-
 .gitignore       |   3 ++-
 app.db           | Bin 16384 -> 0 bytes
 build.Dockerfile |   2 +-
 ci.Dockerfile    |   2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100755 app.db

diff --git a/.env b/.env
index daf7372..4cc8d31 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-DATABASE_URL=app.db
+DATABASE_URL=data/app.db
 BIND_ADDRESS=127.0.0.1:7800
 HASH_COST=8
diff --git a/.gitignore b/.gitignore
index b90f924..2af6060 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /target
 .idea
 .vscode
-/app_db.db
\ No newline at end of file
+app.db
+/data
\ No newline at end of file
diff --git a/app.db b/app.db
deleted file mode 100755
index c972fae0be0980ab5541b515ea788aae2ccf139e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeI(J#W)M7zglkTv~|K1_orY-H;)X+R866rCGoP(?)TU;y6{3#d6}KbrjpwcA$*u
zSD_yY_z=vDT!Io&sX>gi`k#D0pP#dJ&re>?mOJmPAY=4>oP=IRHS(AU0(nI#Aw=YL
zgV$xr@q<76!ZPreRwVl`zit<P5^?7#+4)xZ!W$F_KmY;|fB*y_009U<00I#BUj$}`
zxFt!FaOGv*aKff3OVY(|qh_0iV^YU>ZJBg&ik9+}20pE~9P`Mu>4{x$8g`#H%sy?k
z9op(z7Tx7zA}?h0)Ua#EhP{f+10TFJ{S+tut-(>kyo~uSUz|GirrB|f=E>@6`o?@~
zbS;P0y0&e$9CtM&U!ENaTasZ2SI-tXxUL_tlug`pbk0K04TH19%Yryc*GF<UvRyxp
zmOgSIey?Q)C0#Dx3bC6^BbSd`&GR2pDR*+4(wQNUAoAH|dNJYab=R9_@uKgppO&kv
zkImQi59g2DHm^eAJK-A&1Rwwb2tWV=5P$##AOHafKmY=FPM|1=Wlfb;S=MD$QS^#>
zFz@ZjFZSdLl@F@2R#hu`o|jPgLHLFO0SG_<0uX=z1Rwwb2tWV=5P-nF5O^Y%AKiQ<
z@caA!H7Q)*iv*Db1Rwwb2tWV=5P$##AOHafK;X^_41`T0%^qm;|1FfFIxH$`aXcIz
z`nui=8(Hsotg(J1$LFkJ53<m{c-|aM25shi9`E-iS{#|}%etkWwwK@k6@{vDRXwa$
GD!%~r9nQG`

diff --git a/build.Dockerfile b/build.Dockerfile
index 88703fa..aa2c40a 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -33,7 +33,7 @@ RUN groupadd $APP_USER \
 COPY ./.env ${APP}/.env
 COPY ./migrations ${APP}/migrations
 COPY ./static ${APP}/static
-COPY ./db/empty.db ${APP}/app.db
+COPY ./db/empty.db ${APP}/data/app.db
 COPY --from=builder /actix-demo/target/release/actix-demo ${APP}/actix-demo
 
 RUN chown -R $APP_USER:$APP_USER ${APP}
diff --git a/ci.Dockerfile b/ci.Dockerfile
index 4bf0138..8602d02 100644
--- a/ci.Dockerfile
+++ b/ci.Dockerfile
@@ -17,7 +17,7 @@ RUN groupadd $APP_USER \
 COPY ./.env ${APP}/.env
 COPY ./migrations ${APP}/migrations
 COPY ./static ${APP}/static
-COPY ./db/empty.db ${APP}/app.db
+COPY ./db/empty.db ${APP}/data/app.db
 COPY ./target/release/actix-demo ${APP}/actix-demo
 
 RUN chown -R $APP_USER:$APP_USER ${APP}