From 76f505af06255694ec7c46124bee6f5575d00b9e Mon Sep 17 00:00:00 2001 From: Simple_Not <44047940+moonbaseDelta@users.noreply.github.com> Date: Thu, 20 Oct 2022 02:59:49 +1000 Subject: [PATCH] docker --- .drone.yml | 7 +++++-- Dockerfile | 14 ++++++++++++++ docker-compose.yml | 8 ++++++++ package.json | 2 +- src/app/boards/boards.component.ts | 2 +- src/favicon.ico | Bin 948 -> 15086 bytes 6 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/.drone.yml b/.drone.yml index c930e3c..b83a63b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -15,5 +15,8 @@ steps: - name: pull into the folduh commands: - cd /usr/share/$DRONE_REPO_NAME - - git pull - + - git pull +- name: docker-compose-rebuild + commands: + - cd /usr/share/$DRONE_REPO_NAME + - docker compose up -d --build diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..c258818 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +FROM node:16 as build-step + +RUN mkdir -p /app +WORKDIR /app +COPY package.json /app +RUN npm install +COPY . /app +RUN npm run build --prod + +CMD npm run start + +# FROM nginx:1.20.1 +# COPY --from=build-step /app/dist/nedvach /usr/share/nginx/html +# EXPOSE 4200:80 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..8fef6f1 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,8 @@ +version: "3.7" + +services: + angular-service: + container_name: ng-dvach + build: . + ports: + - "4200:4200" \ No newline at end of file diff --git a/package.json b/package.json index 58c8cbc..df5a126 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve", + "start": "ng serve --host=0.0.0.0 --disable-host-check", "build": "ng build", "watch": "ng build --watch --configuration development", "test": "ng test" diff --git a/src/app/boards/boards.component.ts b/src/app/boards/boards.component.ts index 88acf4c..48741e1 100644 --- a/src/app/boards/boards.component.ts +++ b/src/app/boards/boards.component.ts @@ -18,7 +18,7 @@ export class BoardsComponent implements OnInit { listPosts() { console.log("Получаю данные..."); - this.http.get('http://localhost:7141/List') + this.http.get('http://api.vdk2ch.ru:5000/List') .subscribe((response)=> { this.response = response; console.log(this.response); diff --git a/src/favicon.ico b/src/favicon.ico index 997406ad22c29aae95893fb3d666c30258a09537..8d33a0f6cda3daa1d98b9323b03858c9bf605247 100644 GIT binary patch literal 15086 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
fQeVOzlW4uH8$F#AOd*#l9b<>Qm~vKH6C z8e9cyTluiE3(@8p>0J@|YOV-hN`8~QjMAT^OWkZ-qVR6j1+3it$@5+-k+1Bpzc0GGy$X+b@+sugH7WbZM}Nq=J>@6Yz>U1Fg>3*iTuaqEV?f(0 z?ws+QvGidsiLc`bSVJal3oi!OT;#eTwl8!*2~&zOlddktjna$a@r z7le6bEsFbFx=ZA1{V#i@h`3}-TU&?Vk#pf3$R5OQURqvN`VCB-(W!qL>;_YQ;x2Mt z>tQ!^KKbBxVe3Cr@xYe7LMflQo^c}iK%c%AUfhU%aysOMjkd2gb8gnLH++opY2pp(S=Av?JIP$IH3v6Wl}!n<|}@N+zspQEBAa3-*L=0>{sw& z>;;TIg1}Ma5Hnjah#ZSIYqXw8+u)c`gt^t%$-Ui170+v>t>l+@rVt)c^w*Ad)|uL| zW{WbH%(PDtGwm{K|3@(>^%!|1avbB%@}9j&Sd#jO10~ zW?X~^>*4MrI44H8G3Q@I2zh9q_~YWL zUb(07H=ObdPkf{53uWX9ww`~WYV%U#omYL0weeDN0<445$G%*129Mf-__r=2cIJ6< ztlOYT-@%&oPDIZ=icPHbOYMIXxt_Jeu;9aX%-c^Kjhsu=N#2=t^hNna&EKjTxo`p% zPiy;9b9|@j3Y-)3;E}Q$gE;RZrd>nQoG&nnHT?92UmKM+E0)O*xE1kK#T_`QcM ztlvxRenazpEI4!*^A3_bYhlfrH9)ELZaDf4d)5A3|Kd~Mt2$NAJO2Hj>rHjMU+TWO`EFHj<(WCZ`3LIHUdQM8FAc?~f26+Jnx52ErIsq#<$RxY z=rd?Cm%-e79P6oLVeHD`!dj%~6xf6<#?TqH?7#Y_I!jCKRL;^;hm?Af)B~heqiUx7 zEa!faAI>%RxqP1cOIm+o4TQB2p2c@cZHw}s`Aq7J*(ZL$9)p@ja2yIC+M1iHITMGf71Gy#lrMF+5^`KpgAw^s+mYH@1??zx zL8%FDrZ3B+mc!2#>eDqM&09AcN>M82|+S;Vlx~f^nsbI}RYM0uYpVT8*>!Yt< zkl%JgTc_ZAM84FEr6ylW*+s0wNPR=<9O4i8{aFp|nM|>}{4Mn_(Qy~+5@KtSU-neK zs(11Gf>S^KyZpp7uKPDor)nhHcS~)hn029CazJZX)5;Q&oW>nUvcUB0)s*NrIJzr2n1=lxP=lG;=?-&uI+2{v*b zt!O4ccZM}KetuS45*ZRNa+Mm6)QNwuX=-avQnz_lYbs{#Onk8Y)8E)r^5e7kzy0TW z!2k4TsZ&T8IuyN6uO5DrZ3M zpQWdp=Mm{`G-e+tpZ(wRZ@W6O7p^D&?MF=7H1>bS@vOmpw)~qDbxxCWyzIUC4%Nrc zvkcE}rkx$(;pMBXQSgjz?GOoHv^UL$|ud0o(FOvKC?oMGC z92Cjtz1Sb>2y507T!Y9hvCp%kwFcfX>)|&dA6@zk=h=x^h(QhRV|93D^NXL(y;`F7 zdG71YZIjWJg>RGhRt`>;o%APxn`}XIyoDaAd#h0QOqFjiuW!slB4?*Qc$iL&9q- z(bFXYWcJS+BM4Z}&DWn4qYV}A8H_LW~#du=&mY&!J0>f2bi z|5L<-aNtFB)xjt9;H(5pRy0JFOqAuoDnu1{wI0u`zYf6 zCjRY4_NeV-kJKK7OgzbV)g%0k!`Q@L66rx$dW8L1yf=q^i|TpqaSM)rsrb@LuJ4KS zxNm09OE}l^*x6UfwI9dO*Y>D>kzC=LPmm{ZAYVG1$$9(N#Y>@>$7+lIx^i zUr%14s9F0w*O>oR(xQF7oNHnh_a>50RX%%~!z6#okh-|!%x&uVZ^d{2{pWn}|N8m= E0$od#WB>pF literal 948 zcmV;l155mgP)CBYU7IjCFmI-B}4sMJt3^s9NVg!P0 z6hDQy(L`XWMkB@zOLgN$4KYz;j0zZxq9KKdpZE#5@k0crP^5f9KO};h)ZDQ%ybhht z%t9#h|nu0K(bJ ztIkhEr!*UyrZWQ1k2+YkGqDi8Z<|mIN&$kzpKl{cNP=OQzXHz>vn+c)F)zO|Bou>E z2|-d_=qY#Y+yOu1a}XI?cU}%04)zz%anD(XZC{#~WreV!a$7k2Ug`?&CUEc0EtrkZ zL49MB)h!_K{H(*l_93D5tO0;BUnvYlo+;yss%n^&qjt6fZOa+}+FDO(~2>G z2dx@=JZ?DHP^;b7*Y1as5^uphBsh*s*z&MBd?e@I>-9kU>63PjP&^#5YTOb&x^6Cf z?674rmSHB5Fk!{Gv7rv!?qX#ei_L(XtwVqLX3L}$MI|kJ*w(rhx~tc&L&xP#?cQow zX_|gx$wMr3pRZIIr_;;O|8fAjd;1`nOeu5K(pCu7>^3E&D2OBBq?sYa(%S?GwG&_0-s%_v$L@R!5H_fc)lOb9ZoOO#p`Nn`KU z3LTTBtjwo`7(HA6 z7gmO$yTR!5L>Bsg!X8616{JUngg_@&85%>W=mChTR;x4`P=?PJ~oPuy5 zU-L`C@_!34D21{fD~Y8NVnR3t;aqZI3fIhmgmx}$oc-dKDC6Ap$Gy>a!`A*x2L1v0 WcZ@i?LyX}70000