From 2933cb2f62cfb0370a65a8f8693db089b0a54135 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 3 Sep 2026 17:59:53 +0000 Subject: [PATCH 1/2] Updated application --- .Dockerfile.swl | Bin 0 -> 12288 bytes .Dockerfile.swm | Bin 0 -> 12288 bytes .Dockerfile.swn | Bin 0 -> 12288 bytes .Dockerfile.swo | Bin 0 -> 12288 bytes .Dockerfile.swp | Bin 0 -> 12288 bytes ; | 42 ++++++++++++++++++++++++++++++++++++++++++ Dockerfile | 14 ++++++++++++++ Dockerfile1 | 14 ++++++++++++++ 8 files changed, 70 insertions(+) create mode 100644 .Dockerfile.swl create mode 100644 .Dockerfile.swm create mode 100644 .Dockerfile.swn create mode 100644 .Dockerfile.swo create mode 100644 .Dockerfile.swp create mode 100644 ; mode change 100644 => 100755 Dockerfile create mode 100644 Dockerfile1 diff --git a/.Dockerfile.swl b/.Dockerfile.swl new file mode 100644 index 0000000000000000000000000000000000000000..b29f78f301d774cc623e67dd1f41e3fd7ef3f9c7 GIT binary patch literal 12288 zcmeI2zi%8x6vrnBfdqsgprHUg&LIW%?%th?IF^hsJ||ejoVnNm6i_s`JLlVYe`R;} z;-i2T{s5q(kEo!aprEHt4-JR{Dg<;$d}n4I?jiy~sVu#N zfC(@GCU6W1$ViCkBSNe_isbSC|D(VEZ=Dk2b7%s^&>N5kEkVCNF2s+}H_%P!6X;`T z3Wd-Pv<$rforZopDa0-4Gw35|0!ipq=mK;K`r$DlzJk7lzJNZ2u0R859eNph8u|%& zehn4SOOVNX30j1ngPw&Rh8}|cz`A~iet~|5zK6bpzJ>T=0!)AjFaajO1egF5IPL^C zwtIA?l@)1giCXq(Y3p4fHs9LmU)rSQb{oguHu@X=owv!yua$eR6S`8Ip=XkqCNvZ> zJdpe9MgLlrXXFP$yxAYT*4r9TAd5nX^Mn4j5oLL#R=aIC%JW8Lo~{k+IEie>po+Dk zpsvcG8p~1z*?ycI24kHjb0aXP_Z|+$~Us1LSBvbX6uroGGzDGK;9L6iL@Waf+3a&Z$!61P^0HVV-G~ zX>{H^)TIoyjRKI4!=pwrYqfE^UPm%Li1M%^7jcLI*^-(~@Rhx-i@n?V4JEQ!ztoIc zpk8jL#mCk%aZ$=gHrC8Im7{OxBI4Z8T!*S zIr715K6aJ`8q{vW%D8YMlQ@zn8+2@{5l{ET$Ml;+VghqS=BoHV++a()v*NkJF$TqS z7Nz4*V3ThzyrfcHuj5jssGG{yhuQ(SGYSg-Cx>FH$9dM&uB{Q&3bt)`99M*TMB(DW m)NWlAd8rB3RY_i$EPV9aa^GsMOih{1=0o_laFvEH67d%s{Oq^@ literal 0 HcmV?d00001 diff --git a/.Dockerfile.swm b/.Dockerfile.swm new file mode 100644 index 0000000000000000000000000000000000000000..a6812bb0f4794dabd96e8a992eb6b47b2adc3604 GIT binary patch literal 12288 zcmeI2KWrRD6o)4WfdqsgD4+p7?m~*hvwLS3aV$l`@m+#N%$bXw1Q8U??aui&-ha%_ z9zF^XB@!*r(MQx!rl(F14OF2*K!?O{X4d8$2n40FG;4jgceAszZ@zi&WXm(^TwULw zb3vEkc#g5#XTH4kNAWnj@gigOsLpk5F8uqEl)QU(kuP=mS-!Y2fAN|Q2@CLjAZ@?Sy2D|}pz#H%e zya8{(8}J5>paBsx_Q_L>tv-$5@&Et*zyI%^VC-u!1qpZ?aIgS=d6u!Cz#VWKd;vZO zGZ2AIumoNMC&91B8M_O<0-u5@5a11P37h~wKEv3z;2ZE6xCyR;KInm$z&*rx2WW5s zn3!J&3*ZcR1-uNN1W$n9F|Xgi&)^>T0ela>1OD&^ya8{(8}J6a0dK$?IO+!0HhT1K zD=)Lw0=4Yc($;(U{qcJL`sUzDpO&!gZEdjm4h0l2Hr#%T(3O%LJ=3(gRElU zt*Xc=2pPLJ7{1wCcdv|H91b=pFJif}*x@2AlN>u%?Vy~GRgs+^)kzvtD9SRd5-lmL zD-~7~p=6lvB>7%A(OG)v4s_)oVgqfYq|k-3_XcSA=UYQjRZ>^x0j84+i1RWPdR(aN z{K>7=;idl8=H=C`i-RFzH4j~BB5jk%W2!4j!d;*w!)!?xR7o|(n~9{T$hFKhYg2zu zD-mhi3Q0PN_Aio|t8KUQbvCozxQHrpEeE2lvH1WmY_DJL9mF>hh-URlb61;sg&h`; ztwriusTkX~W_+U+&h1*eCcE4we)EP4^V$jQ&&qPA(?JqEWDv2OV%j}9!K-mt&aZS}KL2qIRom zGWup##I>26$q}23E+0&m**Ta;kcr{1PfhU<=Sh~;T8yxP+pWCmtfF9+r6{()#bZZl z)39~}Rwe_dB28j}k}=NaWITi)x9!f0o z!Ne6Q`F@=!nW1K?K<{Z6`u(l2@PA?`XL?fPP2Jl1FpqE3)+DJ2wTPm{8&kJ+Sr$qY fQdg!$X`%?wZ{2;Xxe_%cHXje+o5EEYzC_rcZx8IT literal 0 HcmV?d00001 diff --git a/.Dockerfile.swn b/.Dockerfile.swn new file mode 100644 index 0000000000000000000000000000000000000000..851caf10c84077bff477006235023165404b30df GIT binary patch literal 12288 zcmeI2KWrRD6o)4Wfdqsgpr8Rg?m{GpXZP-0#IY0!vqgA?beI*%+os$GNQlN8}J6a z0dK$?@CLjAZ@?Sy29B8lU7lc{Am)dfxL zNnu^7u$l-Z!+bZ%_uU;$XY}G9VFPWXq|k-3w*_dp>#lI3vosV{C3R)SHl18RoR_K4 z<3eQ@PH(Ra*9O~LmsYkfZVnNvdERmpX`4hIQ(Z|C?gAwlW=p!DN~$SNCX%8e*D}|v zO@n={M5JviB9E!Ha<^z0fXZ=$DFusvMG%J^zyV}$* z?67!jEmGG?#n`qr;~S%JZr9p1+2uCzn-ea~YbUTj%S)Y32T5?BLBw*3Y4_!nV=dyD zovpwUE8^5dWcDam^kI@BI7wN7{n0W;5-~OcUiEi8!_$&YYq5Tn5+# zQ4#X2Qqf#fDQz3xj%13Km3CRxq^ZkNn`bkj@*u@FYLm2fx+bp$`Czil&cQr_Obq{gYKn(APqM7mVuTIcZskp96$P^_MX}u# zj~%5=!`cm4nGBqYG>HYO#W-28T6M8ifDDj1A@De-&tH1>V3&bWy2!wPHBcVo_jA5#=dSZya&|fQ zfU)uUnd#Ya-d`x-T;=HW%mTN$%~)k_ieoBwea!T{Y)FaPl4#0n_F@$H+;;GeGhMko zHd*10PzrBXmFY6~gSs3p6)fQ?*T<1)vy@Qj+L+};VGXz9b6b~^NgtZD)3O?2(7vH% zq?4tcEOHvy1amqf^lcAEuT36FVDws55lKEWi-5{{f`i?)PzoJ{EYC+hDMB8^n(LNK zl6=?>>aiyyF8n%ACdy>>G;`QVo2w%f55RUG?q8ix)cYqx@<`@!qVL;S8bJ> zTOkkSa_ok(Eqxu?`ms*8xw{v8-5W`DbSvoBD4E-x^R2yK%+5M? z3h0q&Nl6X#P*NjGkSJ)NfC^|3f(D8I%&g5_zz`{wrCIBLyZ7c}-}}vbt37$fomU3y zbRp<69A_E(=;>QKe-`($Z_Y7RkLz65rs2Pjq~zW6J-*oG=XtMp;n>daxCz5;sdbWX z^GXY)WgPa4XjiI9lFDO;`UX$H6Sx}!wVv>$Gh2(jZpTd1Zaq$qoZGsa8U0vKz!UHU zJONL@6YvB)0Z+gaIAH{Id5XOYpYLh>ey%y6y6xP2^(Rlj6YvB)0Z+ga@B};oPrwuK z1Uvyxz!Nxu1Vqf(x2GBV@_smv|NkHU{{QM>#y){|pb->69QySk#(so8hdzdGK_5Uj zp%{7@dKOxMo`ilo!`Ro*htPY_4QLDvpckOC&<_tX_8Igk^geVQdKJ11twE1MKRtkZ zLN&AsU4jCLLj*krordm%{y;3hL%%>jL*GN+K_*6H`vUTZC*TQq0-k^;;0bsFp1_GF zuxgI=KE2V(%dGVbwd~%~)?0Xid~IWRb&VD~9qfBs9d5i%0R?!c-Fk`8m69Ai)3j+S zMYJon6pFIM8|i4cPI(c_aa<>9 zY&(Zlq9uiOrNU||lnnFjB;OCGI!ot9U|xO`J7^;%g)WpG8^G}ILqkzjQdhf&E)v!m1+)?$C)??jh{H+~Zh_ z_`pUhu*8ZuH6EEw$`##6QaC3mE3iRY#z-Rk2*F{Njn6KjNg9)BqTD4B$F{@50=?-n z0IgxABIFr9XH2EEHk{@%MaxRN)N0byWvR)9@Ia_MNU@LFB&`h>R(?p=T+ieff?Q3d zP*l`zbxlTJ%Zj)*!I>Pf$>{RIWSNb@+=7e`e}8L=hd58Ntkz2JM)*Zrw!W9{wA?z>1LhwES literal 0 HcmV?d00001 diff --git a/; b/; new file mode 100644 index 00000000..5764aad8 --- /dev/null +++ b/; @@ -0,0 +1,42 @@ +# Install the base requirements for the app. +# This stage is to support development. +FROM --platform=$BUILDPLATFORM python:alpine AS base +WORKDIR /app +COPY requirements.txt . +RUN pip install -r requirements.txt + +FROM --platform=$BUILDPLATFORM node:18-alpine AS app-base +WORKDIR /app +COPY app/package.json app/yarn.lock ./ +COPY app/spec ./spec +COPY app/src ./src + +# Run tests to validate app +FROM app-base AS test +COPY .yarnrc.yml . +RUN yarn install --immutable +RUN yarn test + +# Clear out the node_modules and create the zip +FROM app-base AS app-zip-creator +COPY --from=test /app/package.json /app/yarn.lock ./ +COPY app/spec ./spec +COPY app/src ./src +RUN apk add zip && \ + zip -r /app.zip /app + +# Dev-ready container - actual files will be mounted in +FROM --platform=$BUILDPLATFORM base AS dev +CMD ["mkdocs", "serve", "-a", "0.0.0.0:8000"] + +# Do the actual build of the mkdocs site +FROM --platform=$BUILDPLATFORM base AS build +COPY . . +RUN mkdocs build + +# Extract the static content from the build +# and use a nginx image to serve the content +FROM --platform=$TARGETPLATFORM nginx:alpine +COPY --from=app-zip-creator /app.zip /usr/share/nginx/html/assets/app.zip +COPY --from=build /app/site /usr/share/nginx/html + diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index 5b9ee4de..c45d8679 --- a/Dockerfile +++ b/Dockerfile @@ -39,3 +39,17 @@ RUN mkdocs build FROM --platform=$TARGETPLATFORM nginx:alpine COPY --from=app-zip-creator /app.zip /usr/share/nginx/html/assets/app.zip COPY --from=build /app/site /usr/share/nginx/html + +FROM node:20-alpine + +WORKDIR /app + +COPY package*.json ./ + +RUN npm install + +COPY . . + +EXPOSE 3000 + +CMD ["npm", "start"] diff --git a/Dockerfile1 b/Dockerfile1 new file mode 100644 index 00000000..6671da05 --- /dev/null +++ b/Dockerfile1 @@ -0,0 +1,14 @@ + +FROM node:20-alpine + +WORKDIR /app + +COPY package*.json ./ + +RUN npm install + +COPY . . + +EXPOSE 3000 + +CMD ["npm", "start"] From 38498c2fa36b1ecec398fb05986ab0ed00bb612b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 3 Sep 2026 18:03:21 +0000 Subject: [PATCH 2/2] Updated application --- app/src/static/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/static/index.html b/app/src/static/index.html index 3f6fb5be..7d5f3e50 100644 --- a/app/src/static/index.html +++ b/app/src/static/index.html @@ -8,7 +8,7 @@ - Todo App + Todo App List