From 9a9dc3fbeae39c83531866ce0afc8a0be099ccd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?=
 <sebastien.a-andre@external.total.com>
Date: Thu, 21 Jan 2021 16:48:43 +0100
Subject: [PATCH] Update for Docker

---
 .gitignore                                    |  16 +++++-----
 .../skydiveLogs-api.Business/InitDbService.cs |   6 ++--
 Back/skydiveLogs-api/Data/JumpsDb-log.db      | Bin 2670592 -> 3014656 bytes
 .../{Data => }/Init/aircraft.json             |   0
 .../{Data => }/Init/dropZone.json             |   0
 .../{Data => }/Init/jumpType.json             |   0
 Back/skydiveLogs-api/toto.txt                 |   1 +
 Dockerfile                                    |  28 ++++++++++++++++++
 nginx.conf                                    |  14 +++++++++
 start-docker.sh                               |   6 ++++
 10 files changed, 60 insertions(+), 11 deletions(-)
 rename Back/skydiveLogs-api/{Data => }/Init/aircraft.json (100%)
 rename Back/skydiveLogs-api/{Data => }/Init/dropZone.json (100%)
 rename Back/skydiveLogs-api/{Data => }/Init/jumpType.json (100%)
 create mode 100644 Back/skydiveLogs-api/toto.txt
 create mode 100644 Dockerfile
 create mode 100644 nginx.conf
 create mode 100644 start-docker.sh

diff --git a/.gitignore b/.gitignore
index 270e942..28c9b47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,13 +16,13 @@
 /Back/skydiveLogs-api.Business/bin
 /Back/dist
 /Back/skydiveLogs-api.v3.ncrunchsolution.user
-/Back/skydiveLogs-api/Data/Init/twinOtter.jpg
-/Back/skydiveLogs-api/Data/Init/skyvan.jpg
-/Back/skydiveLogs-api/Data/Init/Pilatus.png
-/Back/skydiveLogs-api/Data/Init/pac.jpg
-/Back/skydiveLogs-api/Data/Init/dornier.jpg
-/Back/skydiveLogs-api/Data/Init/casa.jpg
-/Back/skydiveLogs-api/Data/Init/caravan.jpg
-/Back/skydiveLogs-api/Data/Init/206.jpg
+/Back/skydiveLogs-api/Init/twinOtter.jpg
+/Back/skydiveLogs-api/Init/skyvan.jpg
+/Back/skydiveLogs-api/Init/Pilatus.png
+/Back/skydiveLogs-api/Init/pac.jpg
+/Back/skydiveLogs-api/Init/dornier.jpg
+/Back/skydiveLogs-api/Init/casa.jpg
+/Back/skydiveLogs-api/Init/caravan.jpg
+/Back/skydiveLogs-api/Init/206.jpg
 /Back/skydiveLogs-api/Data/__JumpsDb.db
 /Back/skydiveLogs-api/Data/_JumpsDb.db
diff --git a/Back/skydiveLogs-api.Business/InitDbService.cs b/Back/skydiveLogs-api.Business/InitDbService.cs
index 7d48de2..d50de27 100644
--- a/Back/skydiveLogs-api.Business/InitDbService.cs
+++ b/Back/skydiveLogs-api.Business/InitDbService.cs
@@ -28,7 +28,7 @@ namespace skydiveLogs_api.Business
 
         private void LoadDropZones()
         {
-            var jsonString = File.ReadAllText("Data/Init/dropZone.json");
+            var jsonString = File.ReadAllText("Init/dropZone.json");
             var options = new JsonSerializerOptions
             {
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -44,7 +44,7 @@ namespace skydiveLogs_api.Business
 
         private void LoadJumpTypes()
         {
-            var jsonString = File.ReadAllText("Data/Init/jumpType.json");
+            var jsonString = File.ReadAllText("Init/jumpType.json");
             var options = new JsonSerializerOptions
             {
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
@@ -60,7 +60,7 @@ namespace skydiveLogs_api.Business
 
         private void LoadAircrafts()
         {
-            var jsonString = File.ReadAllText("Data/Init/aircraft.json");
+            var jsonString = File.ReadAllText("Init/aircraft.json");
             var options = new JsonSerializerOptions
             {
                 PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
diff --git a/Back/skydiveLogs-api/Data/JumpsDb-log.db b/Back/skydiveLogs-api/Data/JumpsDb-log.db
index d624e0197d8307af5242e988be4306bdeb87ebfb..f06fa07b713b63e73f25dc87646e7b229e539853 100644
GIT binary patch
delta 30883
zcmeHQO>7&-6`q+TMe2tXUE7IcO0g7MHQPG%PuxT*T33oB*A6V(t&~`?Bin>UCk$*+
zp(r~JP>cdBkQ^EyK^iD&fhLV}=%EGd3Jrt)APIs3Jrsovv_K98s-kJ(Lr~<<LwZu*
zn;~~eYM0z4cR5Z%16(hcyR)-z-p}{Fd9zwtx=NRp-l0o6)tRp80X?X<=^;I=x9c5x
zr{1MU^r+sg$Mg;Qm-LPLCVjJhhkmENMZZhms>k&ny;r|m-=_EJ{rWxnc72CFpnqB4
z`Bvh+;S+=qZLRQ+q~RNR1P{H-2>CmMO<(cH!vA;y6Z>K>|LpsrUG(J(G!itv57HfQ
zLX@y+Y|c2B;0Y8r^4Q7^wzZcJkl(NgdXY}hK7!{53inwvJ40WG<L|;pUiTX8#LlE=
z356XteleN8K%%gl%j7b{xcU0I%tgWurn3vVqsfaY5-j{k*pX!Ap~LJ*=JE7g$vMZ9
z3k#Ps*;#TgT()oG*ysZf3{GB|e`YSVZ}Q00<mIRCJ9g~xWcGnQgS(F(eROQ@$?^T;
z-`h8NIDd0j$JaKle8M(&4ZKeJgczlu@QDn`LZcv5vPPzt`&T0qT|yp0GVH|4KiI}z
zXyG#Jq(w2TrI))`wY_wDd1O`NbZGhgvjg{rVh=B*vgDEC1)tL4lhCX=kR0#wC?2vM
zNW4JyPwbTpr19Mt$Wz#y=n?)#a6`qOIJSNu@qBY2jn2>);P@}$BiniocFchkL)8X{
z#J~|Yk(^sRpFEda%)*lzLl~P#&rPPENs%SIcp~|<_yR2r5;l^YB>^~mY%z_Or{_kK
zbD8-o;@IAA>>=#?DUjNwRO#WpgGCu0U;{6}z@X5~VKcf8N9C}clEY@oft@V2P&RB_
z4%;a?Y@=e>HWY>pnu>ilmCTYyi<ka~-ai9J%>hIuCy(KwUxN|;)yfj_0*1qOzqCK&
z`yjmo#wAMVX>3Fc5&lMIR{q5H_i{XH4vujnngDw`1Rr_DJ+NmCj`q;v#rdf#^C{8~
zzsGif@j<T$+mTJ3C+)Cj{7$ryboN{}c|K=%DmP9b+E_L-e=;*y((Gtiv&Qd46Y}aU
z-W|Is?~a-wej}Q&37b>IZzMMUboyX!<U%f;TbxaiH@e|r#!~YaGFOaaw=_b+C(^km
zMi+C*%gHN*bR5m(QVXOVpK&aiOOcN^9(v`{%1yQ%ZS@s8kf42Hs7$pngbJOLYI9nu
zjT{F!M(Ip(?90^VHK{hIrP@pgwTZ7&8)zVg-64+^8~KP<jO&l_&Zt1_I1JT11BnSu
z_}q>w_hwvCvnnKos$Sayc+o^^n}9DCz_ZXxXC~0Nr1JeQUJ{Z*X~};pt87#6%b&3H
z`2;-#&ZLi^vYQ^wP{_ciAkZxu*jb;@NOOZ1NFy>YwcWcu5;gsvhJJ96PC;81eh>SB
z20%y<ou7=Y;%2y^xRFC{xtG8BX5`;Jdq=?w$4kJ9uq~tS_;eHxiGO_%-`81u(6IOg
zR&K2HCwP_c_D_RYUe!QAqUDycR(HZJV|5a)3}ZEQiX(moRde9id~s{skI3%At;MTH
z_Om@tCg?n~c4UUJ275t*-_`(fdgsUj(vfi(D%XxIAlw&j<enIAE0>075<D&X!V-6j
zX9`~kK06=z=Rm&aTLa*ytNT3^M!Da^yJE}BiPgx#E~87diu?N+oG#p7;0+MwdjSxu
z=zGikwcMWzqqec>mit4lQx+(=ji`{=Sj1E$)wKbzi$KAP98nDg%#9m#uU-m>N(B^f
ze|#=MU)Ah`1-drjAKM1Ot4(V_SG@}sLAAjmh|V2?#a3|E48erVI7rBkzXfLUy&r^L
z>)~+-lUA{$EEPfD!X^*}2mc6Sx)lVq^Ck>%yIh1XL~K0|<7iW6y28vwH16DNEVi7o
z@_x8~V_BPqBn4SCarbgDxXRizBq=VkHWqQ9Nhr8P|3(c>z_eMDP%y6}zlCE}VSaUo
z0XzL`NU2=t6lQV#F+Urf!lYzLz{LA2G(W=CnqM-ENz+2a3~%KL`d*-V)Wk?2qGo6k
z;>v;s(*g}eO%X<lo9joZnK){@JwoV^eFz0nv@tY28C_-O9;2%Wzcl}p)_n;h?6l@A
z%Ki$Q!YJGJ35Yco0$pu9%JOO%|0b9@$0>>O@Y2*M%e|Q!sasNz{OyGyRTgD2`7P&0
zY&;^u!xE2J>?`7wx@M6oB*mLOi&TL}c%8FIUPW16Wx}mORK7@x`)YnRI#m*7xhGST
z^-GGYHNQn(!~Aew-AD5~$(uZhTVZ}<_t!m%`?oECM{WgcV-k#;0+WP)2+r&mTF5I*
za{Zy8iAO>n;t>Q1A>4?WIJqZ6y?y>yQu-M{j3i`3>7ltQcqGKoDoFsDeNfyCJJ5z3
zky|$5i<u^ndkl57_;2N7wyTE^0rYbWY}n87Vgxp!En%n!2}6600UNVYp&wec0Pywu
z3rFt4pbd(EjWMHb^Y|``KI)Pb_pa!p(qA}o7rd<K!zKv%2yDzrGGhQnK@m;7<a7Ff
zH&7mfDqCTGuG0rbme_dwa=2KRQn}D6us;hx?Io|U(WwHkfuQbD%~gGp;-1x9)n$GQ
zytL-ZMpS+R8?K-_tyEH|f8Oy5z$-2xAg^A?SD#Y3(5cyGm>*2yT)Pt>U@YVe1{x@%
z{SV;!|D^%cXgoD_{b0KZ0mGkP2pC2jD2fxro`zpb_9O%p*s*PGJAyYnK>$|)9zzD8
zEbQf<({=`Xjt>DGuZ0y67@7r|IEw4b7O;6yy0B|C@}Q&A1@<;HBtU0)7!vwt+ri32
zCtIZpt<r^3UtXUpw+MP)^vbO-dg%i9q;$aoo|k0PswLBkpj1(na~42R^Q)XoTsmet
z{REx0FsA`ZJzNsu#!+$mB@q@%<sNj_!kk4=s;F{kgg3f)#KNaz83N!)NAR3WPN>TK
z$Xs*H58%0e2f*{euycrxm`s4Xj{gEg-xL5~))+*;{$NDFb2^hhKD@JszI1#$Z@4<w
zfVS?lvw(@Y*V$P&&>Y<1qzTR2jVGzx6K<2C4<H)iY7@VUy9rDm7AFZJkiRw>`E#7_
z23F++(U%pEvESld5ahQ%(Lu=b9biu-Ub`?o<zxy(wSn>G8JK197?*4NoQTR7SHufT
z0u{x#B)44hXXCYf$o_J<dQw$<yTCnI9BF|B9A|&I$ayM@Z-gs_m+4t97CS35zYLcv
za#fk%6#)3_SKQi|pC3S6mNF?bzZ`FTZL)>=IS1mRlu4cWX}sxcSj%w&cZ$S)iGG=R
zS<0l${9x+evH4*Mv*(UVlrpI^zx0R~uLhXj44ma`yF1>35LWP(&buI54g~<m*3Vl2
znP_E8q&r&E3Q&l$#?jhs84La(S&VQB_S~gIFc#d%J$X914!N$<q&1>BL3P^kByEkg
z!%G`}8izOEYzoxJb$*ApL9WyBVkaTjI>8Rb{asBua5pdQ@L{fx;|ov}avdm&$Gl7V
zN|}BTszsrXAC)eEb9}Dfs9wIoZC`I<1GYToI-K~RR4#N1a8|>qbV~v)UqVzfE^<GV
z%7sqxrkdY+o#Mj$9L_ovDq*~YrChD~<+$D3h1QEoNXl!jV^%k+0bBmPug4kJF{&HA
zR4NxbrRIG-CQc9&$qKoSS>33H>)1^s+nAr{T*s(xRAYX*#wU_(q94!}C#+EQL~^Ey
z;1hKUX0mo|0#^8ZhkIs-fL}1fuKmCarviZb>tlv61B0BUoEdhun4vmm*eNI{y5$~V
zhA=jAnWx~2Vypzer1`$F*t2n1<~bCon>T8|$L5hYcD~a^$cJ5Esb)MtGK7i4YQPmL
za^Vbhz!f-?yO%wB4DtDzL9vzaMlRpBsf;)Bs;|YgiJTttMyY@5cq8Nt;0>Z4E0w8J
zHRs5<TJytYVa<DMhs8@fxM6;3c%#%mW#*UT)!s^LV}4%pMxlS|%#Uzi&963Z#Q38w
z`Vp`{rRH}JzQ{-<BNXvQp?~Vk?+ISzrO-C!=P7SQ{ZnXuG45ydbHE$n`Bj=9kt^bw
zH)&C+Q}F!4{DA*e#p!;*bkskE<~MqG^+hFDZ?cWRu&;I2$FdE26gdV+EE52Z<ep`B
zmaJ<pn}6+UvFzJ{W#3nYWp^?3L6U%X2xg4rymKbsw<B>rJ{yP3i(3MYY};IRh8kwQ
z><sTFmY(fdjT~^a^i2Bz8WU{3Yc&FUQE&?G*t}aW@%f!Ga7N}^GX{_%@{r97{c{0l
zZr2$Dn>=_;Ht&|qfA(h#D)CGK&Nw9Vs%H!U{V1&sZY@2tEX}tuzuIgbf~G4r(OP<@
zwlu$qD`PAj6|9W$l+A<wxrlya+1qnvjE(s@VDm1`FZ)?v8Dptbv&1o(|KhBSvDPV0
zfRQW7d%$fW?V);Q%oeMaF(@i1E%?g@NPK+QRe$mW*`%PR(HsER9|eF?x=Vg^BUiRd
zeneWy57o&J9G(*q`w|1Y<Of_9Vd$e|VSA^M7ZF(sQP|#*f8nFpf%u65NSf7?B$<N7
zrRG56<Ober5<an$poz}}y7SwHcb=xSTk25$?Kcxw>D}E7lOBXV44a7P6Sfk?4P{ZN
zus<A+#mO1y&lr5Z0-tDL`NrDL0~@e?itR_Y0`LDOi{!U0CH_aHw)etukz&QaD9g-0
zADddpi9fXnf8g#1;qBy3wwv6d%Qwy>_H4r*n14_6CVUgU@BR+7euhP5>*Jz}Ra%Fu
z#3|cgM|1$Hw+kIWBny9mGS|1S*oCRC0qA&XHx6vT8;i%<un1y%B@io!EmkVFp(<jF
cF??nz(WoKOZYj}jxb;`#o8mAYR#M&bf7lI=g8%>k

delta 90
zcmV~$R~Erg6ac{UNQh2Eiy9>?^M1@uScFeYGZXPm5$_a|j;>6ur>`(DG%_|ZH8ZzR
cTB@w9ZEWq-_709t&Mq2PH+K)M=jZkN0}C4*k^lez

diff --git a/Back/skydiveLogs-api/Data/Init/aircraft.json b/Back/skydiveLogs-api/Init/aircraft.json
similarity index 100%
rename from Back/skydiveLogs-api/Data/Init/aircraft.json
rename to Back/skydiveLogs-api/Init/aircraft.json
diff --git a/Back/skydiveLogs-api/Data/Init/dropZone.json b/Back/skydiveLogs-api/Init/dropZone.json
similarity index 100%
rename from Back/skydiveLogs-api/Data/Init/dropZone.json
rename to Back/skydiveLogs-api/Init/dropZone.json
diff --git a/Back/skydiveLogs-api/Data/Init/jumpType.json b/Back/skydiveLogs-api/Init/jumpType.json
similarity index 100%
rename from Back/skydiveLogs-api/Data/Init/jumpType.json
rename to Back/skydiveLogs-api/Init/jumpType.json
diff --git a/Back/skydiveLogs-api/toto.txt b/Back/skydiveLogs-api/toto.txt
new file mode 100644
index 0000000..6f708e6
--- /dev/null
+++ b/Back/skydiveLogs-api/toto.txt
@@ -0,0 +1 @@
+1totoTOTO2
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..28312be
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,28 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+WORKDIR /app
+EXPOSE 80
+
+RUN apt-get -y update
+RUN apt-get -y install nginx
+
+RUN mkdir /app/Front
+RUN mkdir /app/API
+
+WORKDIR /app/Front
+COPY Front/skydivelogs-app/dist .
+
+WORKDIR /app/API
+COPY Back/dist .
+
+COPY start-docker.sh /start-docker.sh
+RUN chmod +x /start-docker.sh
+
+RUN update-rc.d nginx defaults
+
+COPY nginx.conf /etc/nginx/sites-available/default
+
+#VOLUME /app/API/Data
+
+CMD ["/start-docker.sh"]
\ No newline at end of file
diff --git a/nginx.conf b/nginx.conf
new file mode 100644
index 0000000..152bc55
--- /dev/null
+++ b/nginx.conf
@@ -0,0 +1,14 @@
+server {
+	listen 80;
+	listen [::]:80;
+
+	server_name _;
+
+	root /app/Front;
+	index index.html;
+
+	location /api {
+		include proxy_params;
+		proxy_pass http://localhost:5001;
+	}
+}
diff --git a/start-docker.sh b/start-docker.sh
new file mode 100644
index 0000000..1005408
--- /dev/null
+++ b/start-docker.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+service nginx start
+
+cd /app/API/
+dotnet skydiveLogs-api.dll --verbose d --urls=http://localhost:5001
\ No newline at end of file