From fdd6364d1d0265ccd39fb106fc549bce8c2a6761 Mon Sep 17 00:00:00 2001 From: Stefaan Ponnet Date: Sat, 28 Sep 2019 20:00:08 +0200 Subject: [PATCH 01/95] update to 1.9.5 --- avatar.png | Bin 0 -> 26621 bytes build/Dockerfile | 2 +- dappnode_package.json | 14 ++++++++------ docker-compose.yml | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 avatar.png diff --git a/avatar.png b/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..916e6bc0faf335f8031993f16161998f463c5390 GIT binary patch literal 26621 zcmcG#Wmpvd7d|{o3KA01p=-bbQqqkqAuXVEsYppTOROR#AR^r$EJ%aWjYxMcxpa3o z{D<%F`M-PKJTIQPE?i`GK5@={?)#iGGr{Vr^2CI6ga7~#zf^#00089h_U8^B_?NEH znXljn-diPkIQR)3XEHUu;0J-dg02&I1^V^}@`5$d9sDD{^Gg+3`~?DBJi#Yba9t7r zcmTYFOKZ7LY)-qmGmKP8?(W3@eqC3k5W}I*>4@#dJ;oz`*pF~fSe-8Yj)Rpmg^+nc zNRWB&2mRn($csDQ7YA)VwvFMPJk@_w@z$!>+3iNpD&faHoJQZ>r+?8S^8x1 zlaq%q!se=wp#S&d@&yk;5Nl-1g2QSx6V7+iv^!D{kz&AjFALEFpwWKf9}ZFoNrNN- zE`U;Cj5rM<^+zK&5VpZc_6i^bLb26x(-;~RfEK_Jf~8ezdhIKKWWU()-N$4{DQ50@zs5R^(=5y;PBXAORj4u&*7{r<6pG8u z+&BPy5DxQw&?1>P)DbBNxnyh<1zcgMFAuBLGFTr04EVDjv+J0*=hQ5)cgc~GSnfu! zkxpbvZ71ESdTYuyQPJZeTYwbX-3VT8nXrszY7+ujgu||hvMb1hq#pequ@t)|n&n3g zr|{YSk^!DVgqke#vxU@_=fbZwvn$RaNI{?$F!9&O9cnwF0_;Qhf6aAMm{w!SCa)?iA3^<>WbQ6m1RY+?_oEd{9w( z$ys6EW0tEcBBau1mJBs-Rqb!^k=g*qD@7Ngfd{rg+}h$=4vRWs5A;9|(Dj3u*N4;%c6yzlh-}j2!AtO6W z(0n!3&jvMi_PoidY@qfUeNe{&HS@6}<>=CY?we6}`Okd*$3|B522RLZo6O7(4S!nF z{G&6lge7p$PsbNwQ76$={DJH&pSn(zEQd0pO*XT+jOsrDmf z#AGd#3t0p?bBr}vgbI|md&TCjAMfEm*+pV9VI}xy+R@fP*+mU9-FQ=vQC6t7PD}&F zBJ2Fg!jb}p_sjbZ{9Q{RRwOcRifuIm;x$?olh~Zz3^5=?@W!M@Jvxj0E0Ifc{5bcW zZXsl>tIB7MgJA#Nf+R)bN}$P%T%dU1qB)RqFCyLt0Wi<*o@)U!xVzqCP8qx}d621W zC?6K+h>S#jQ)f*G)MSEKrv*4AxnOeM5F%`{&JoTmlo=f!fujOe>P0cy9i3C-nA0V;h z91xJZ0I5yN9pTSmdl1_=X>)~_OV=2|d2EGl#;^^t4?!5#{G1Cui%WO0UsQy-Oqvx3 zDh)NA9Pw z#n$@<4#}KY3CQ9i9df+-77lqkO-O4Hv>cROM-2qPsn8^*^wk~2;OsN#eB#Rwy`5ib zOzlRLZ;Tm ziUVD>J2TkWEKDC|D?LvIpifOXL!Wp1ux}m+tV$9GUa3z1QSs9lkdb6uJ1YFhfF$Te z_zHgX7oVJFH+n`b8uv<-bXtkAIGo94h*sgs()h|nFV}o&5Xlr|2eE&}Hj@*g@Ng4l zNew-^h(Fc6k2FS<6-lx2&PQ6tJbXBYZyoBkc7bk^P-teSn5J{s-NSBS0#rDS7uNYc zesqK+wFn4qg+lC&b3a!2qjo8o*73isH$HCPM5uBmd}kM zCmY8?j7{e~!#O$m5sQcqO31n|)HJnGAnzs&`S>f^8nVlaGzTs_Ht>ZUr(Xc{vhO1` ztYWFDwG?~4coW$_iENmuXM=LFq6BJ2TRpvGRz-r_kk}_biZEd7wToO0VVENrCl~cv1~XBRi+@h89cOg_*{mC9&ci=W9U{L_@IS zn5fLTgPq?(w1zg;sihviGb#!=9fW+obZ7Z)2+UeAYbRL&ksMu~uZBwBXRG7|<>U7Q zb^=ob%|2n=gqXhK6VLZ1_?ypMryW13(N!7(oa%~oEi`DmY2a8ml@qAz^(AfcQ8NI1 zi@M|SXT`{LGol>L2=aqM1Fx)L(JUdsnz6=spw5GQGDD7kS|0Vwb9c-t7Z>sz`2c zM>WD@?$boz8tq@52N9ypp|{$>-6cWpK-^!#My3MCe)rLqxVQYy?_)(RV^=nNu)cKZ ztGjp1=HK`DBE-AQM;%tC2Xn#QEFdvHFnz~Ovc2VBPjK8{qh0G0p7M2kt4>wQ&Ux)2 z>Q3Wl%GeG;NK&H-#vB2u&5H8GSlT6!-0x0y%~67tNyCoVQNsnmheip#GXnPt*zjB^ zu6=D#B~Raq0!v!<{OMA3vH5UnR@Awy@#iyN9AOm-)UdT;j+2R9*ZDWn{S5)Km*=+e z^;7qxU}bp6M7?T%Cp+E-Y7(CWBw3kog>3Au8Y!AK$e&oXda#YA+F=)uw|HPtKPr3l zl1qr#kiEU@I7c2<28Y|)dv2r#iVL!ir~==IBgd06zJnUn}zX z$^GXW(?;U<9)w-<8o-LMOh^=#YM)(!#<~*F>*Tp<1G{{=1bov}eDX(C&0m~wX({jb z6TlX0w^)O1O;*L{05pRSmO1rVA*X1w^H%^M=s1ba-5WC-{Gz!B`lW z9X#>H%1JbE3fHg_ZMWOfqTftzln5UtUipU4%}y)7V3qJ@O{~<@5$T~C6eAaH=BsWTJD;jSVDghbP)|s_@MzZ-rpt*e>0mk*MiQfd+9u_fOb1%a#}WTyyb{=@z(zNmo;DaK_BllvVz^^?Y*6P|pLruwgX8uN7O8 z(yo07_w%qC<7GJ0LQBZ8}z~iHM3yyQV~PLHQ#+&4DCkQR%&uy|%`!SK~v!3-s>J3cLF%Z&?u8FZRS|^5bo%*4)G1 zg>J@g`E(QsA!{`3*TPAcm_$HeVV%ko`u^1dG!4$TU-!1L+e(Cm`<+~{Htfu69%n}+ zjBjlwXBU}6E=i8(9vac&A{KtN1J|w`n{F$%cEs0INNqz20*41BODIaQ_eoEoeiB?# zN(W!};eJQS&1{NI4^ zeZ9<40H2W zMvtM)?#^6Y@WpPQ>v{t+kKyJ+TdIgj^58G@mg282Q5XW8c)eIZCe(r)S(RAJiDz(7 z{>iG(JLrDA#C4$~*;$EvL!LaGi98}rt!v>WEPn%A;`eK%1J_wEU|ix{JQ`@NJiW4p zA0@&GsB9* zHAzrASe>9WtdNJ@XI^E_Mo2YGm^WmTOPNXfnfQLR|E%-Z57B|Ej@s}H4#z&fQ1z^w zQ)Z4iNu;?;+kcURCK&dAS?pmc@P6%`#n3hP&!M~Y`y_a&! z3B;t%rV=#+9K$Yk6Xs_Jx|y~{qiM?>nPyVdWQ>h!bA2zpBY{d?saS~4_CTGo40GT= z_w7=M(hLW2pD_g%>S@36C8A2nsj~XO(mB0qIn2T;j%?ukEbr)g7P2=Z4uYlGKdLM3{?`A+vhsFZ9^nc7*{FYkvDB z??4SE>wxTP1Am5QS5%Q#664SGA+>i+!sW#eVS&0_dL$-dn<}uW7^HZh2})_kS2sZ` z*c6m&>7s!1?BO$a6t2{tkQ)hIELEwi-$BZU>p#JYlk5zNv^&f6`q+7j+$Qp?zhmN) zpfyp_+jd_O)e`KObFTVz=gh@L0N^(b5#&qXWq3>3QqNxNiQWL;68d}d|NT+ z1Iw?S{aG;lLPh(j@}O@;nrgfKX2=4?YrN|~GvN(taw4hWi;xPsM$)Ad6x2~-VIMij zxmZeIRL`<)hqQH&$Z_REGGm<@@XqAv$KaAx(KI4@v1@1CCuQ8|cAZQ}o9o%3GvpB+ zFF8-0WEbTDqfZq(i9amG&ILrhxZgA;@~;U4x%?{Z;tD&pgcu^-0^D6Sl-6MErmz!^ zL`3V}UtsqhQc!l0E<5FE9+?)@u{`LKtg#Pb(7h}6V8NuXXm9Fsz$nO zLcY?mMw30@PJfI;ARflPqXR4?Q-n_ao*-B^%4aNS{Uq4Ewqxt)S3A-m|g!uR)+#9|!OF-5})hLoJYu?zJ0t>4A_e2Q{qAv)n2&m5&ybKuq^@$xzD ztip=vkqf{T(jEroy|y<~hZ81a7x)mEupsUJ&M0Zj4D#8iXXg`VYA{)ZTQfFB1BH|k zD8Ogyuuxl+qLL(LHXu?ryGg?0N#uu3A9weH(dZwATH!(YpTu#tTxEEA&uSf!Oy?G) zgMX$ykmJjPC#j#hH3()Az_k+m8kkiBjIml-j`XPvu={oZLB1jLn0dMTVT_&%$5d^R78_xy{nYMV)s47kK?r)R;py}i(g+KI zu4F(BOJqlU6=|9ZN!hXjb{N+o4rxi#HNEZqym56mrjs3iY>KrBH<99|ib*0m>%$!m ztCQ_xdqk^Oy!Vf{V~h$p=q#j)T&{cj7&#a*ToC6;UN!9M=LCh4T_ujDeX6N~aP~c& z71$mzbx{eyG529SlNdvoTZ-4rRX=tJb=L?^qvYJ6eT{~dNUf;W(~%$iKOK21acztz zdw|U+74jbL<2ak9%hiy}EfONfa{eQIt{>dYxeaO|u{_fkD6B>tG6x%2lm^?J*m%M2 ztWOqjx{K3Jp!(fy@(rLwB4{9XhXZ}(mhZ&I$cSMWyP#i0xc3wQ0z#8j#}z6${^INC zzxfBJ+|h!x@Dl{<_Zdnk0Xgq26yDDnPIj&F+68`P$C6Ng_-+vg9tJoX+!=(VcC)(3*e zJMTPlu(;*WM=x07YU+x7xR9^y*SP7(a&C!)g0b(hP`;)qSK#5f7t)1h%7@s``$3uy zpG*qA^QjY=kBI$+&}_iUW zwB*I)r}s&2#Zv_9R8AxO$;II~C!A^6akz*JH9B{xlec5jWhg^t9;{;=;R?6A`fK}F z-H`7s^Bu?(qF$=1yMP!L;-?v#0KW%mqo`s|;bUiVJ=5?@812o z)+Sowi$i{Gc6VsRFPG1r@9;8p|5nAm<}~tK^4z7WuB~&ZKJ3g;%u&N~AB1V=Or(D# zK%!n=*1JV~VeDQ_t559a+OU=tOI(v+eK=-a&OTKeWJ-g)su!kk-Ss4G)VEDS^g1SM z;R4@i|9+~~ffwTL3Ia0@>mIrJc)NnA;qAwm87klg|At}g$II)qD8+S0g91`oJsgv# zLq7ejX}&d^#KUxBJ9Td@Q;fRi=D#qI!64kpExa&Qy0_9|51`NCi+KPB2W;0C*}cfQ z)Ga3EdbwU0)oc3D*G(d7>hj!bP}IfyRPgTH)^#%$qH^SJXO$pVK%1EEGAin8Nc(k% z!=J&@V!^*gopZ~&JK)!ff5k3&-ZWQhA04{`q?s?r=}2ZB$!JMtvB!1--PllX@d+?= zo6qvuO?Pa3C^rfIF3est{J55AZ&+`&{i>Mr47yLa+2hcP{4rMnTDqZgRq4~=x%h%w zlG`gIF-x^C-k3t_718i7S4`rotsWTW65nyfYCLDIrzgp)d*W9*up<~LB4P#WG+912 zaiLa5HITnc7f^MOxOf83yn7t%!!!20C3@=8^?TJpcPp*rLZInoQIQ=haW_#jIk!lfp zWEa0l!^!5+s@?}ertd#qx?x?}k7Za~2&%C;UDwR8T-6cIx^*Ny^F|7wNRDkk7{p4r zhl7nZPo{oTJ0^{}y&lieUE$`Bi9E%R@bG_jT5{AD4-ZDN-b95XQ$9?_ASrMC&zU|J~3NM1iI zM>sz#Dp$hYe5QF5e3-~kLG)6Hddz&u(~#Gk>7;ps$!J5Ud?aN9cUK?qb$(h@b@hFW zc$O5n?#^W1^}8ywt#=eRkUH^ns}$7u-aa`uJ>GCuJd?5Fp?)^6YUk!ccmLD|h=HMw zD?u{rI@*9Ks&N&G_6j!!*By}cb}|a6 zx7K~bCgAM>X{0D7{ghr0b~b9J>f6&jSO1vU(akN{|I0JV{{8&21Q(<7;9yg{`e5-I zZ*xi5r-HsQF~-cs`Ao#gq|cyt)p2Xlm;FbL_1Ihz;r?F{UQ;t2PfH3E9Qo z_4YLW2(kavb@2I|vS0jJCKFK^Q)q1S_Wk0(>AD2rn&AaG@3a_*&ayQ2l1r5j*vd`% z>wM%mcJSw@pkG?I2(p!48eoGsO)zWZE%RjNALe<`lRwA5BCBuK%S&Hi4ggw{3dXi z2!R++70PDMiqfzGQ;KHHj#QlZ%|nvex2P!dgE*4={axbqXTF)-b8d|(-PaqY`A)^WMGJbxjLR_Au^0bHnJ^HgyZ(JXky#MwhSC|l6kwERv~*SYseJA>_%_x9phJu&zyW_G>O)cL%mEz zQRh`?Y6&f=6W(_c3VR5-Mx)(^jtuK7YkD0u-f^RhYRYRdJO>z3P@Lh#;ctVYSBhIl z(sVa1&DK3s5uZ|cZrEEtV~>W{m~yEdY%yS?hFt;UFW%}ZEBAVfk^w3<)SJxt`9Q)| zqk1RrX?)rerekShBh-b3d(GV$MX-0gMo>+C{9A;JWsA7Xkr?pZ-_?7%DIJ3JpetL7jb9U)JyTV$ZKCZ} zrSJW?T?DBlJ-%j=X?YHa-|-~>zs~|J3sc}~E~`VXVBtP~xQGlaN%x^McT*_RDtu?h zY%Egyk~`-EDbl#{qUTF38yaM`^IuIK|C+6nMT3yV42`rj2}AU%%AW9Q}Q^MrWaZ{$D?vo&1)^22jh83GV_A{A)r`t1y?v5mvr z+I9YA5oWF(2jb1L{2VXsDoCSKuX=F>E+*xHP-bUYKwkh1VM~ z5T@!OrU^UB;}h1bmpr4eh+PLd? zRFDA-nrKjK4kpb|sC@Q36Gbo%{C#~;EeDif@7oioU2wZ4^k;UZfp5O_TR2$73cj3mLFr-;7W~moeax4?)I{3*^qBn$isb} zK@Y^b|B&C_zxG+tkbe|U>I#-f^u0kkl+J1R-QXOt(BG3RXQS*;uAp|=-kglJgRk!Z z+V4BHq{8>X=OhA7_SE!E`yTibAG^lwWbNC3@|h|kG0Ao6%Wg_ZX4-B}brs%eGx{V> zW)si+L7HjVNCwCPgm4?N#x5MGPfC(>iq(|$2`;WKjZK-A$(14lP>mf6;U|9#cCNrj zGGa)UCaPA_ocgGNxbXVaLNFke##ew#3I9O0CSjrv&`r(550E(G**icJ zjMW$cRTjl=i--G$1Jkg6@&nABi?pa?XWHNnoM1RsLe`RywD+boQ!gbF8EMDt-HyRW z=#TaQqZeyPdg%X8$4|bD=LA8#lk+VhZT`)3?<#Dkt5b5MqpJ9xLS8M?N&3{Lq^8~o zqlVEes!2Mnln>uZvHaw79@RDP;Z`{iBcr7t!Ylgl^&U?e#jAvPN#FWc8XEhxg&VJc z1j~ffXKZYAEm03UmGL5xtOp!=r3&mYSe5or=?~JY6?G4fv!OZr(|krz*V5C}e1cz&tLyk>;xtpClISQMBH4N*5I2R zl{@TmrI+>Kb{D9z``QL%zkdC4mmMl?mzn^Yxwjelt+eVl6dAj%Y>sN*>*8i@Tvb3~x;HIfH>nHw{#i*~NBa{qNyfpw5J-<~HXt|RD z6Kg zp11#2rq6wb_|!PKxEemeRBo5U882v;@funOreO&G&q0Vs#*6 z2kkPwyPlv3s{@VGz@i-Yy^G<&EiNB(t2o73CZG`*DT|4cboEu%W#D#T;=#+a18fuu zrG}67=`*E)5!&S{zT{mS6)#H=O@FY(Jt|HEcWG`KF_>A{m#q7XOG{TD{{@kWIQiXf z6K@uS*dY#Ro)h)n)m)~cq_qFca69Ue_N!MBN4@O~Jv0uo7MrNe?_e9eC&{tXkv2(i%+VPY&#P#fn{7JSv; zg_S|5M(t5?=zKTS(>upEL_c@Pi5+ygihT!~xGU)?XwpuLHb%E8*(MWvxhzbo23u5O z;zj%E-a?h%Eks^@=&-{7Y?P7R)2jrOx41KSTBth7| z&6>&6VC&-RVRrlvU9Vb&w@QapIYIcm|20))N;49nu=u8#yYl}TSZMDb1wUDp9PB=g z;)xASYj#^0y>=_P)a{bVKmwr#$=oS$!kZn{3A$NO2kRE-gBXzJ*};I>wLuN5=i7Di z^*FJprFbzZVco7)udAo0jl5M@I6Z^^jTp0Cd(iu`$z=EG`%~Vs<^dP) zH=wtQi;KTgEdDoe7f8;Ipfiu@4bgte#H>SnsqKAz%zc@+ajD2|p6Y#!O2|?%Q4}IG zgo%raUUa>F{d!9J8|XAvaU4JCN94g%i4Wy7o)$F?ln#Avnti2Aa2qBwiNa1<4j?;S z7g;7`#M9jjD3Rj(HKnS?ai<66NQ1jwv^Gz2XnhG%vH9~SBoj)^jD-HSoSdA?|3j~@ z2xusmAwD}TMgKTDd~?uJ2mAYq@#ME|ujhOFFKF^bdOxjlu#Bc+Sg2fv8qbs44SB89 zUu@G0+Dw$<$B}z)qf)so2Q!u8{&y95Fx*x{af$oMIp!59p5KW|0w1jVzn$*;>)X{G zt(tJVGX|V~v%dnNq@^-s%OLQPW)gY}>*4Ct`H%x8C8g9smt=}Lyiq0J$C8r1Y>}UD zErDtcqj!tXvV0d$jvczHxCXksDL0qR_OHyXTYnN}TC$M`d%b~~ar5Ivf6KN`C`ZEn zvq4p7r{cj~N-l;g-|U&n)pT`rPu8k?|3?QMJRbXt`QS(ZVueXiJ;8N3j^~}Ksp4%; zLaZk%>+iAGLVYvAO{DteASER_`luTOYiB&=?Ua6w;0BT@3H?<~6f;?WZg|!gZlM1M z0ldxiydsj;g+2Ue4M>(8Aw8Q)O?ho??brWI&iA0DrNuZD4t0tn&p}18frsa}|IQ5C zxy^W=l+Mr3=f#uPuc6f91Z*Z={|D!vJ{`Ti^}0i)Z?nGmimX=``l2c;<3!uZz?B~L z7`jcnd=O%|rqujv>}<%a`{vEDg{!N8p9tuQf%IhW9cv!^Ku-L3<9IQ`jy#EEq_0r$F zT%m`@$3FJ~bG2+T^UqV1|KWuUNUN>A9IzMi!qJ4*v7#L1zcHKzc0{r`$zt)OJtwgE zRdaKF5zY#O2?xR=vclrBUeg7X1i_?lNqwwpB_&UJs8)ZdlsrprV$j9#W}?`%`Li-1 zxD&dcPgRrLU%h!V`b0UnbO%KZrhfCmU%wJ^3O>G7i)GMPOev9(2gMp+j~-yt1US6n zqZ1GK-^j{fqFGj57;dWgK2#kP3y#Q7Aa(=3AM}da>3~C;M{5{l#pu=@MrJ9;I}&St zzCDYiP!)Q}3o?DGRRR?a;R!pmn8Uh#(TMhd%G`$2^PO=BXM?imV)z2_(p3y0oAMPhpG&5AibqR)qW?tlaivMk2#H;Ll)+p zogJ5zwRMT@v`D@|6*(g#BdF2xN=kRDtE)|Psg#GlWSMOr)Mi-@K_lApo;`b3#&N`_ zW$*Tcj<>LCnXUj#kUK!Ag?hD3OiqSO*SNhK|82IqwRKf-QZokU<}TDLF0Au&plD z+Y*{L1$zGA79eV#6l9y=2;gvjmI+``K0@7Me6{h(0n>wWFD~Ko5n_%ySbf==V=%D_?LYG3lYV4;P(Wr6W&CBYpAQKp%-=Clrl7A zblt&ht^IyZChg?({CI0JP~q|C&CQQ-S@GXGXn2Sgt}Xb^!@qs|CS;9c#>T0i5$f9Y ztU@a~DoQNFQg1@6_Uj!mn=UcyqN?3%rMIxKkdl{gORN8rk%2uuJ&k>?-}SqHdOEDU zT)^4Q?GX*pi=om|&%Q!SJu_F=V@!E@`I9}NcOoEHprYfSo6D_q#~(N~a}Q>@VTOml zfc|{f@#6_Ns=~wx$|L@$D{WhRmPgWzuQ@bAii4_I^5(2B6VE}=#ntuapFb3clWkdPX~>K8?>mCIuN3cx zw7USd=35Vr!F1vuvEY=tj=K78ttm~F&sCVXxcIMvf|iLg>k_LGw$h4<8rOpNNBxqW zzd68YxU|L>Y3BA~9OG9Jg|e`iztq$mq8cUdnGhnzmxZ=+mYFXi>9ioDo8Gao2WTIqyWZE~ludt_@c$!+&tTh)d+UKy{il1c)B|mJBmiT{aFTsAtHRrp^fp;{=tEr(vlq* z0Mgdh>|h-tURqwxt10oAD&!$mi0KZd4!l%`k4|OH(^X|i6~@MCC<)+SPlwIymf6D8l+WOM@PO6Hb=fxL<5lywcVVEG*HVZc#D*X+LWn7k}U3o>tU2F1^K-H)hV7+MM4Aun3$5sgRmHao` ziBf{2qobgfx7}YJi`hH7x?Wp<@On(X$59NHKl--`&TJoWXZg^ybXU@=FeWC$7xp3nqfp+KkCHMx-9Mtg%X@={}vq3v9*>7 z0?)ui%5Qmjxh(&6RAHqi1FB%7u%?%lo&Ca8h@rkS3^@o!Y-_8Wnwzszh_+};6^(sF zbhJMR;??TyPVf=j{I&J>UrHu^pbi3Y@r9UPV7NGj46zDl0viyO z0<=w2zw>>QrRxzVwugs@+zvx<4k{TpH^I+MCWEeNLwwJoz&N-9a}K8pyP4jlySLeP zmgsh6#$yH&QY$$}5GxI?&RwM`8|uG(xsW;>0WmRPc})3$fuxxm4^s+5QN1@eXC|HP zQ#J+t=lBXN+t8p^j(xfWUny$@y{m3)91dPn&)io$3z8U)A(|{0{yj1hdx#I8ygvgh ze8~*aHwg-l=aqF8sSV2IESHuO?XGpefxsKU5)FLQ4fR!7S$I3O2PEqo8v`RF{F#H# zrvF3a$>CvIK>;y{$U8V#>WW9!LPoIH8d_SJEem^SP?}DMIQS+&mrR5q|VnPB~hk#EzDQtr%$edkV()04}ev$$}+5-IZ##%};~2{)zD zZd-6T9_%=|h3DLab$h>xW6F8Z*7 zokFlX07eYR3BsE{ZUru|d9DXM@^rtp?^Kc`d)e*Hx5$BIx+b`=eeA0n@cS0Fwyn47 zH`%4hP5PJuoz9|UYs>j_fE9E{ljmt3!qfAcex0Wag=WZQsLb{vVry$lGY~A!kL7O= zAS6bMjKiy|ML{RSIvQXv6q=NjbR(2#2;;|Xlm(c~t!~kUeb}Mq!)t!H zI#47BjnGA2`P706H(Bu?8?f>(xGz*dk~5V+$hez)a=3EG;eV4O}r=<54^myUonn z?+yN}e2kgl5D1qqx2fng=$EE%jG}MA;JKobdX9{YV98tf(apEHosu&zp3qC5pzdc=Z^N%v!IgN*a)sRE? z_j?ys%4(WMFVwJS)}5+M6`0F&q$W)_EZM$2d9V}Ix&<&#`9+L_B?-bIOh4u|!GlU|w+Yjs>)~ zv(sit8|JOnnqE_Q7TGKL!DG5kGKz-(q! zdi6&YSeX|58&!lPzo1~nAAwtI(7qkb*F6Bcd3As)S;Rvpp@DlF>35NC#LcJC8te2f zE-p#Ca^TY9E$06EL&)Oqhqv8))E)gk7WLs5&h0BOm4XopVgplC-MUD=Owc6(Nj8(^ zPs;6P>NCJbWm}VpI-mu#cPt{9uw=G*fChZ~mK1S>&&}$47QEdlz=yQ&)>W_UX;_TDas$d6F_w{T3aF}X+ z!Chsn{k%T!Z6`97p?dHo*DNqEx;h0LdzgjMvd>Lv38HS>OEG5CDGHCjb(aQCD>FE1 zD{hfR*a`6Sd%uPoOrE=SM#1DBlS{}9l^(n;854X{=w*j%&2k22iX9b3h^;cr-@kto zIy*a!si~-pG_|x2Yxu24ODi1;;LuN?jup{?_!|PVz)6tC_#@ZlvxuwMQP&^6A$0$>eBXfeyzVp=)Y}iZGBOdW!X?vWM{JU7)&Yg<_}VDE~CNZTa6VJy1l)f zIx;*gcD5L)R==>!4`#fYV5^jxqf3MuyescKgR_s8U3BRB?K3hpwW;@j8SJDx=<2TV zCuB_*M$yG6JWiRebQn5A9B&5ykt4t5Cau@6kEErgnfwgva+%suu<$w86im*;E)xRdGzs=Xf?epO2d4;`r72(yM^3B&JzL8L=l(u{Q3Ex z+AfBY+OTLd-O+OIiwRCly*J{n^`l!BQ$QR0Uaf*{mYcgcSW6c-`f6%@ojM%HNAk?x zhp}KJ6&@w2itYWI0(YqfYLYc1)SPr$Q$;anMla^b0!)taDmdTL1SIfT4(40%{nkMr zIYHup2hiyfosR?iOYA;PdI}&MU+!0dP7eZ^*eoH-+g*l+ohqcj*2+p`gMQ{zE-Vq9 zDqy4M12$w9g5mRTBMv9>9y4NBYgmEl{%K|52J z!I6=pc5o7j<_Y;Vq|A1d04SNqT3T9*cz#V8l2hCC0X$-qgofT=nz{rwz$~u@QA&ov z2E@d~B?$=$GhjEnjwDSB#xG*X^mWLh-7rc+luxCmCOdnj6I4k7S6A0+$8@j)%AyS-}a9f_r;=!B>ir;)j_>oef}o?pRn_mQ2<5ej!+JA|xan-Kdth zG$EzZFaMZaZjCPF&v*I9WQd`!_`lBrh(z4Qc&sog$MY_oS@3y&%Ca2CzjJ3Ii0lz3 zgQU-8>Dj@GTWM+OM=J}3Yu=1xQMb2UG0$$BWK4JcUw~ov?H*aA_#p)GW~j7lVeeEE ztk(<0gH#f<#LIJY*D(r@_d^Re{P8_lH`lhd3~Ozt&sTI7Zu?@gN--RkM#UzdY!jAW z;;$`P2AC=n;$TsS(eS)g2BrKiy`Zf#s;vU7#!|rBWtV24x=Q}$u%3X#7XliN}BvR)V7WQ^@cAlGZ(^RH~lLqgBr?y3RIOfzvZ}Vdm z=o(kmcwW>)uv(aj4b(J5-*s|wD&kT3Q(9f^xlprHKe;$+mzR^{QI(&+`9x)ih%7#7 zy?WV?shSlvidCr!-?jr2YL|@{6fCOkVC%8^83V~xJ73Sc^K&H>L6Y;tjV}TsQcNSmiN9 zH;nf8?|x6D&dJTyKq^0j!93)LN_}k5*1Drv6&OzhgEhtNz%SaEeJ|I+hVthu%SRUn zZn(I(EdDRj{o9xjAM@+$eY`a_BiSidT(>653c%hQ&k&y|0KQm1tG=4fj!KImS_U`vQzO@S zNe_l1YNnwGhEsv}Eowo9DPz|zbT)GfVWyD>F?mg=)}Ax43DYu7?IIdv>D>t zG9{~W0=G8#pANqIRb74l8SHhw2kSCD7=KzvAjo%BpaM@%4Gc7aXlD|MFi!GVj*qBv zTDj(=B=q*;o{3a=>?$B2;Pbn#?uuDWZ10Qp4q7Jt`>j-p@3~)sxzYY$Z6Kx~>iiu@ z$e?;wQ88qzCg-kIzhNNs_jyaxnzpYCr<klO7`YRJuUGR&&sWsV0gej`8j4&pu?(HwZF?-?rN9z>M)Y90Zn1bz$EprRH7E z<9-U@Iy0&|17ysN5}occ+WCdnu&$ooUQZz~zfwjYz4W^j0coVpa_j%}_MK5pZPC^N z6i{gb(nOFD0hKC2db!f2i8Mo3nsn&`p;;(`MuL|nh;#)3sgaJNKY_*S1oJ>-R4-E8F5@5D)Z4FaDs?G^1NiR_TJvw@5Ad7SQ{mIxlJbVf(FE8IG zyoL!12nY)!ZeI$jtf4?8mD>Q}WdbUdp7yzP(pFfaj-wV}tbhJ^d7%Vwc|*nKCBFHb zb$&~|lOT(r;yMCxa8$YI%|AH45Y+wEuIPuNZjT>7{ngWuA>+Q-?(65r_gVwWJR?|` z&G^m8`Om6hE2BPqF361eMkq2amb76Ix$aXYMgxvr%L(`E7rzoj=I) zX)x)82=qtepv|+Oj%C_EM*mhP00A7TeJ%w9GPRF1*||G4(Vgqa0l@tV$2aD&Iu!8K zUTW9;P~QC@0=WREHZ)Pnq|orx9#CsyUMHmV zbRJi*0H4vX56ct^pP3bYi)o^5xdIH>4|3{^d6PkgoB*bxVmsPi^6!g>T*9zoi_O^f zxviM#Q179#2kNoP{yFfSmlDX?=8B4nP2b!vpihMZ5IPMgrQ>x6l=ATGVp#WkS%UvX zB2(n6sEMwtAZ2Gm z?E5K`LSV{*06J-2!4>u~(LOiREmNxF1OBHV!5Y`i4@wymWISkNY@xFN4j|j;17qW@ zF9oje;Rf%grzaO_`_)nL9n1kX&AHjxvvhG9KdO5I0XJ?9TJs$Z5%!aU0@nrcvpZuT z0ZNaQP2cOX{0Hn;{%48st#~tFXa2gwoIY;Lhf9zwz?h=41iU!*OWE@*?}VL4N5$(!^anTHFGeSgSu;a$)wo-VP(C= zK>iEO9azSD*}_=p^#QW7;Pva4$_6Q-`IvM}sIO?Lt*or92ZfI=``+V!V@)9v(5LF63y%7k5n<**@S%QhApt|MxW9 z!0LB@fB(F59k0*NDvA!_eSzzTP0eEmg!#tiWN6WCuL&*(Mhb;`>*p6lJ2~#%Y(r=Z0O{Qc@Uf(ls;XV02K1pwegXe-)PlXT|9@9; zg8;W`uJfK&84=ny_@MOJu{*Uh26VXO($2hBm|~h;5X0}7Rli2$#fU=!X$}WL zC2QJPB&6N;bQ^{D1Q)o5_enBH^j*e)$c?CS#16V6R^xz+Gk_6Wfv5JB08=ox6@I#> zR{ZW3pc-7k9I@&gn~=X@hMZ4Nky){InvAW51;!7+ndWj)cN%a7c!kO!C4$3#NhTa$ zzI>THKdkKHisbA6QDq$h>Cp&!+ zpze$7|Jnly!`2YSDywq3i?agKrqwYoKWXP~`bD7dXe=&vzpJjU{;j0M(+?2w?TU(u zm|DfVl3_1g)8qAVNP69=q$UZCJQ+SzRvlOx1~K;E(#-Abrmbvj8lkeX2he=e(Y3Yr z1@h)2d&PyI;i>?ZECWqM=`M6_b(Ix(yy^fzE})EAfcA&r<>?vVnIda|`@OrOJq22z zaC@${;LmP$pa^?S*H-T10sqJm_=q|4vB)<<)3G>(vy8icBeiI{e|)^YthSaI-PYEo zstgw7${lt0?%i(V+|DE%X9tuLrE`N~j3~K3u@&TzsZ8y5vk4+KIr+Ec#bk#{{Af8Nt;Z7& zkM5?7C8tzr>UZ?j<*D8U=5<8D79x|bbMCP*CeS}sfErkj6Rg2ZBKU6 zt8he2iQ&sXhQEFY$#R&So{vqxH=BgXa^Ett>5} zwcRE_?0{_u_A4|qH=nXGG1-Zfa%SD0Pqcxt;_CqSwbo$keXj(;-mm%U0hl&W1RBns zo*O5?=U0g6GSEYwyLRo`2#Q~oG(S5#J7i;H(^}inK3eY314M7gAOr#rP3a1_xV>zA z1xw1#&ejWBAI0Y(}(aOotzz0E8`jS5L2f$!ZFk7%R*|KQT5vP5uF}_;ICA zH;8vr{=f%&wV-Ur+lY@OC@DFagHb0&#(kBuc<qTvhELB06xFXGd#kr^Ih2XCe?b&xD1pMF-PPIY1-hWjRMgT<_VbNb7-+pW zR`A7E8&IC?_!I9S&~AAb7ZsIam)0DfK0SO10O0{3w+F|Dhm&jK{0cJz$BeICTRZ|b zsIRD<4y(}F1U+4*A{-9SQ4I{-Bv}Uq zVQd?ql;a?uKY#w7(%`ptc6If29W>Ngm$m}sNAoSOiEn;yl=nxI0XW;#XtJ=fQuG4M zOFVG3KJfF|kbV&yx{*X8-BeUiXm!h{*b3(O{n=S0?1IG^U&vJp7VPk)9l z0&rjobaZs&k?vYVr6KX>!ldc%d{-uvGq|FQhnY+$SH3W1t(xz3Mlj!R$dfV~On-6F_*613)wHMBH|&2fh>p*6$to zM?O{q8u6fdwJ*!WojtB6{{~B3-$tOSot4#b0C3(K+_tTiRj4zJmDrl7%_l#<7oxh- zZ=!}74=c9J(LvTNi2Kq5;oCXt!^wBoO`1$CEiKooPEy{zGu@o1b?}hn@}IaOj}{aZ zY?8PwD_dr&$1eY~y7UH%eAPl%3iI(PiIBKke7i!JHSWZDZMdZDlaL1d4yW$>dm>c< z!20bJ(W8&$6o{NR_WcOOJj>+jP%`P%ZmhDft7KT1vZZ6l!`YbcQBhIe$H=CkqSxKf z6@G5++HWPENmDsOIg#S%Z~$O7fe&BSMY#$3ff8)QbNT)4&q5j?wr@EfY);-(P*4c} zl-|M6RWUZ{b@06CT;lvPcbyIzj2sZ4jH~+m`FR2KKLzpveTKo&UI=sThzPRl#>V@- z32Vysbp!GuO-54kuR&MEk=f-HHl`TDR6}sQZQKpY2`I;Nh>iUQk5Ad|zmL8V~oe5fTWKv7c-MaNRt=}bMHPt=YE zGq6xEIo{#G{1~Q1mFDRPTr{JYSP|nzkZc=vfG&0e2nki8pREW!8qmZP$}-H@C?^)Y z27q5g=iF99QF<(Qx8k$!{U}-QDOU6U7BvrA0X9Ho*NXEpd7FD8d9fYfHC+baK)jo} z29*tra7sF8KB%4CB%pt5UFYY|BrEYU$^Ort@#faohpx1=sAalAfk5VfiIH&eq-xtucznaXmPRt@SWH>fG=qQ z#Ar6E_%vb(MmBVy*!3myvdcJ4x)}$N&x4qCsIREm_@%h>WklJJcYs|dr5fA)^{mZ4B<_vrL`?dhk z)Lr=c^di_jJ*)8o=S)}1?mfdinf*}%6qn=+CDzGKVk>KFc6rjGz-{isfi|kDe`%-D zSY$x}FAaz9=GxQ;u86roDoI1k{ix%)}`tCd^d5IyWTQ{8z->*C2Cln-A(0)!8S02Y%O>6Z!_%mnjkbi?-W-a54umfJYXSAb9N&h# zsoUdYpp9q_@C1^_1GV9bNrCu@k}u#HZCbhS2Zl2kdl_=#El3`Xr;IbOLAz){Z$3 zEg*zs1_?yLzm2kou;}B>`ZCwO)uE-g-R)L*23qyLQk(I=rZColc#Hr3syCM6q6vclZqNZTs5DLk8YVA?l;mQt z1p||bJZVZ2fnEo-C9Jizb-Highhjh)8k&&!^jMn5$@Q@`a9P>hoSd9sFzn+5T3~}a zXsgyY&dH%L)|Juf;<+Eay@px6krYd#g}PECFwrqF63j2}tVxH7q5-PxR|OIUcXtbl zp>;8I{KzMdL3Srg;OaX7<>Ugo?`h-L@p3UH2PP5ts zWBauBIbs{=;QWhiKrX(Bomoz6OQjtAm4BguuN|1q+vsSnAgLhtN%Ke0>n% zK*w@LUluSs^A9(Tt5d=0uC16U`t?a zo+ev%4rEN+*#;Cx*w~oa&ulo*(0>Qh?$)_>RD}1B7w7CGu3!KBYOnTb(jOgKEiEmQ z(`4OVv1#sq+xeyeC{C3D#dQ442{C1ioCG1PYSrAd6;z~4u?4o=jESBgn6T?Q#EvZ-C1z$b$m|QeV

i{q9m3#Afz-QDmBLXBJ3fhP2n4QMFNRGa;-L@XTkQlol3RyvQZSOkK5mD{3RmY zYdpsTCp$WH?o|s?^0M4dkk?9@nwqr1Tv}-#*5sp@b{HA%p zG$RwU`+T)9leb@=VDrQg>t@PYPkwOo4^y*&qMsa97$G7Mq~?jOR%)_dPf|93SM z8Zo5W1Nj>Pv35Byjw?DNi6aqjK=`rKkZ(Ay%C4xrkKtof!k^!y$=<0@XxrkK{}~jj zW1I4bJIhEit9}To@pDtw5JrSzb<&SpAENC79@u=!GWKRQqjx9v2Bfh4aB@@~ zdGHw0hgLGMNr-jKwga$%t%Vk1;qp;cg}227*1Z1F%~&;)Ky{_%nP~F$f5&08Eh$5y z8nD*yNO0LS)d|ahRcG2G$nQj@hR7nLQ~x(KM=JFgYT0l3z}39eno0~mX?oF&Ji3t_uR4y1z8%+Wa&Th zw}d+|RKAO8g=Cz!zmb#lu!!o#2GRrab(qURzA+=1$I%+1@^HjJEb=0R1`?8#`C>P* zN+oJp%rwiUPZ^QX|E_FLiMvIygY=@<;lk%Kk>PL!JL-^{%`+!hE?n{>9{d9w;_kK^ zB#Y_^RpcDAxi+kx>Pv-Uq|0EV-$iUCm9^K>EQ5wi7fD7H%gkcKw4?2yug8P3bLJhdemR12y@L0{?6Ivh4kQ|bUm9DRGroq^{QsLh<0_@gX*_mT5l zCwnImN!ztjZgHOX!=G9af#56HBjd$6Ml@$ZYK%OLABI=$R63bPiV9;VF)q&s=Tvw|&sX>-!r5+!bpcGFV0QB=(i#b*#H?=~dU)6}GFowkL^j z31K2h1b6f`RY*3`TB$RH2TEkXmL+CrZgZg*VC_jtY4c7n&cq3hx#PxibMpMGOkQ|h zB=u1a!{YZ9#)ZfYSRaoQNhk>^Ye0M|gxAvB7D4yrv*yhqdXj#Ou5SYc&7c1|Rn6o&_1x->3dXRVl|JABrL0RN8|- zQT^q?=CU@ZNu2$9CdPIy?aK;e3MxO#(q2}cb%igf&B0>HNn}#5{v^=pGy3!*T6INi9wocgy;8%9uVmt)dRuJn`h4pM4C$ zTzeA5$2@b^(W_+5w0@xNy*)AD*l(punYkuGicrX8lEc?YX%_+=>-#|uy*YaDiZHHFyV8z0wIl%3CNU8o5uFn45Bld#$iSV z!ohJ*U-iO3^;lddcD(WYE|0H4klxioirAQf?+PI)5&3)DnWCdCEK>lf#kY z9>odyMip09c``1?xIm{nzjWj`A)j=#au zUC8Tm9$ILLg>G3VUF1G9WOY5{`q{tNA=5NZoLF67P${{R;bXat!H`Y0KlM48|5S8y zvE2YS3({iEn)FO?mD89hp?$&{*~+T#$JN5&kWfZnCQ!JG>qXB7Ec>`9N5Gg@GVq6l z>wLLuEWxK*tii6aiEZmJ=jSAcjD`dOe7e1*cbksj0DigzD>~rwMBYN^Ua5vlt@rCB ztxlq@Z}f@Lqda4+3V}HPf?Tz?NO+ttS;0^tA4aG?fa;jX&eN3dt94YmfBJN^a)&>= z@DCE=?R?0^5&3IhM`+0Z54fYWn9e$P|3xVh`PG@7ZE1(@o$_$k1nwG%KZ|Du6%>Dk zaD%!dM7$!LjML>1+(K+87-Iy`M)=%4jXclj>c$^`U_Z0mpGaPG=q`dgKD-MS&b|~h zP4k!k`tA zr#cMI=emLJFg0-qepKAzx$!RCl1ka|xn9gehwe@# zk-nxgs+{g^y9sBSth^JrVTf}xXO0#5Pjwd&liJ!Acn1Gp_j|3&ecu`??626yE=%{C zPMo~G!gW5*jH&V~+-qQpr6|?{hQ?7IC zh-I?YlMPhj2G<09vG3gvRb+ZBhGjB9{F17XdSH6e;W`{Gognp|>3%`Y0~$#*xcOg^ zyAFH*1q-^!Ig`UC&K7gX`;80REzKLjH5;zw?@Z7pvYnBeH2t(Qq^ItsNq@c2S={*y(#5nb9-TM%UB&A8NN~5rs zu-sJJtn}rC&fN2P4Q0ZIwatRTxW~+Bx?`^;6Zv{JeJ^Tk?P~a|w#wMj4&C2y2;r?# zHho$4qqV{d3Lilpvpui6l^g~;5?wlj&I&w=tMinH!PC~wz&pRX0EvPf4=Bpgp z18dIqrH-Ad)Bi09YcINR1G(SpfooBU7HRo=|G`mt+-g&rdAoD$2Qd;p#Gi$D!D`z`@r|wGq4Wb{JSd3d zQ*g;0SS{{#F!On*C_KF!P#TnUV4gPHOvaH9VjHYViF82iTEi z69`Xyj)t8pm+{g51ldlxPrxpu|3SmN38ctM3Rc_+RxV?Q(7 z!#g!wrjhAkf@`_;y&?RRf&VBhQmEks$o8`GN96qK?bxP$(s0r1}m~Ld4c?sv8 z%j6=HwRpO=I0nB3RZ1<2hdN54qZAIV9+6xfvu(F)Gw8O#lReIMtdHl>LaafN%zPOV zAMKC-ip)qnc%f-}kQq_++O)%eA(C zAl81DEW48G@vzV=WfRK*LkSYw;lso!bus>O;faQn&$>Ru`@PTSA1YzBb+ralQ7l-p zz9XJRmlJ#G^KiXQO5(BVp9`K&cxeOYc|Jfctm$##fW=@>Y8T6!cmcUNJF6)w#=QYpe z`SD?=6DM>BT?(Zg56-z$FsrZBn=##9%=6Yw_G5Jk>@^rU%CR;H1T~>BscFY#9n+*^ z8@Zf5O@tV#`CnP!I=&c1*TSSB>?%t2Hza!lp Date: Tue, 8 Oct 2019 01:14:45 +0200 Subject: [PATCH 02/95] updated to geth 1.9.6 --- build/Dockerfile | 2 +- dappnode_package.json | 8 ++++---- docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index c9d60e7..186d786 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /usr/src/app RUN apk add --no-cache make gcc musl-dev linux-headers git jq -ARG COMMIT=a1c09b93871dd3770adffb177086abda1b2ff3af +ARG COMMIT=bd05968077f27f7eb083404dd8448157996a8788 RUN git clone https://github.com/ethereum/go-ethereum.git RUN cd go-ethereum && git checkout $COMMIT && make geth diff --git a/dappnode_package.json b/dappnode_package.json index b53c0bb..58d82c6 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,14 +1,14 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.3", + "version": "10.0.4", "description": "Ethereum (Geth) - based on Geth v1.9.5", "avatar": "/ipfs/QmZ1Yn6M1bUzRm7yPp2wB5sx7JBHJ5gYJvR8HpDnYtiQyh", "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.3.tar.xz", - "hash": "/ipfs/QmXgcK9hJYSLD5Tvqtfopc2oo6VFiBSQeoHHtxZE9sVRWY", - "size": 16219498, + "path": "ethchain-geth.public.dappnode.eth_10.0.4.tar.xz", + "hash": "/ipfs/QmXzJ29F4RJGtv2FBAggkqf6JQi6bYZGehsDpDb1qJ7C9B", + "size": 16233214, "restart": "always", "ports": [ "8545:8545", diff --git a/docker-compose.yml b/docker-compose.yml index 9e0e6c5..abe380c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.3' + image: 'ethchain-geth.public.dappnode.eth:10.0.4' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 5930bdbe38291ff241b827875c48568073305d44 Mon Sep 17 00:00:00 2001 From: Stefaan Ponnet Date: Wed, 4 Dec 2019 15:39:31 +0100 Subject: [PATCH 03/95] updated for AVADO store --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 186d786..06b6f12 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /usr/src/app RUN apk add --no-cache make gcc musl-dev linux-headers git jq -ARG COMMIT=bd05968077f27f7eb083404dd8448157996a8788 +ARG COMMIT=tags/v1.9.7 RUN git clone https://github.com/ethereum/go-ethereum.git RUN cd go-ethereum && git checkout $COMMIT && make geth diff --git a/dappnode_package.json b/dappnode_package.json index 58d82c6..974bff3 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,14 +1,14 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.4", - "description": "Ethereum (Geth) - based on Geth v1.9.5", + "version": "10.0.5", + "description": "Ethereum (Geth) - based on Geth v1.9.7", "avatar": "/ipfs/QmZ1Yn6M1bUzRm7yPp2wB5sx7JBHJ5gYJvR8HpDnYtiQyh", "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.4.tar.xz", - "hash": "/ipfs/QmXzJ29F4RJGtv2FBAggkqf6JQi6bYZGehsDpDb1qJ7C9B", - "size": 16233214, + "path": "ethchain-geth.public.dappnode.eth_10.0.5.tar.xz", + "hash": "/ipfs/QmctQZw2mSE1csjbdAgDxHm9FWWWrcdhAqCsydjTN3sjmQ", + "size": 16250954, "restart": "always", "ports": [ "8545:8545", diff --git a/docker-compose.yml b/docker-compose.yml index abe380c..e157b1f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.4' + image: 'ethchain-geth.public.dappnode.eth:10.0.5' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 3b9d141bb4b8fb6e2c224fde4561a5f7918667c2 Mon Sep 17 00:00:00 2001 From: stefaan Date: Mon, 28 Sep 2020 09:10:36 +0200 Subject: [PATCH 04/95] port mapping fixes - new logo --- avatar.png | Bin 26621 -> 34177 bytes build/Dockerfile | 18 +----------------- dappnode_package.json | 23 ++++++++++------------- docker-compose.yml | 13 ++++++------- releases.json | 16 ++++++++++++++++ 5 files changed, 33 insertions(+), 37 deletions(-) create mode 100644 releases.json diff --git a/avatar.png b/avatar.png index 916e6bc0faf335f8031993f16161998f463c5390..9a3d804ad33f4fdb22420ad17168efb325e879ec 100644 GIT binary patch literal 34177 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 Date: Fri, 13 Nov 2020 09:08:11 +0100 Subject: [PATCH 05/95] update to 1.9.24 --- build/Dockerfile | 42 ++++++++++++++++++- build/files/nginx.conf | 79 ++++++++++++++++++++++++++++++++++++ build/files/supervisord.conf | 19 +++++++++ dappnode_package.json | 14 ++++--- docker-compose.yml | 3 +- releases.json | 29 +++++++++++++ 6 files changed, 178 insertions(+), 8 deletions(-) create mode 100644 build/files/nginx.conf create mode 100644 build/files/supervisord.conf diff --git a/build/Dockerfile b/build/Dockerfile index e186d02..b252db5 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,3 +1,41 @@ -FROM ethereum/client-go:v1.9.14 +FROM ethereum/client-go:v1.9.24 as geth -ENTRYPOINT geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 $EXTRA_OPTS +FROM node:12.14.1 as build-deps-wizard +RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl + +WORKDIR /cert +RUN cp /etc/ssl/openssl.cnf . +RUN echo "[SAN]\nsubjectAltName=DNS:ethchain-geth.public.dappnode.eth" >> openssl.cnf +RUN cat openssl.cnf +RUN PASSWORD=$(echo $(LC_CTYPE=C tr -dc 'A-HJ-NPR-Za-km-z2-9' < /dev/urandom | head -c 20)) && \ + openssl genrsa -des3 -passout pass:${PASSWORD} -out server.pass.key 2048 && \ + openssl rsa -passin pass:${PASSWORD} -in server.pass.key -out server.key && \ + rm server.pass.key && \ + openssl req -new -key server.key -out server.csr \ + -reqexts SAN \ + -extensions SAN \ + -config openssl.cnf \ + -subj "/C=DE/ST=AVADO/L=AVADO/O=ethchain-geth.public.dappnode.eth/OU=saskia@ava.do/CN=ethchain-geth.public.dappnode.eth" && \ + openssl x509 -req -days 3650 -in server.csr -signkey server.key -out server.crt +RUN ls -l /cert + + +FROM alpine:latest + +COPY --from=geth /usr/local/bin/geth /usr/local/bin/geth + +RUN apk update && apk add --no-cache supervisor nginx + +#RUN adduser -D nginx +RUN rm -rf /tmp/* +RUN rm -rf /var/cache/apk/* + +# Set up nginx config +RUN mkdir -p /etc/nginx/certs/ +COPY --from=build-deps-wizard /cert/server.* /etc/nginx/certs/ +RUN ls -l /etc/nginx/certs/ +COPY files/nginx.conf /etc/nginx +RUN mkdir -p /run/nginx + +COPY ./files/supervisord.conf /etc/supervisord.conf +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] diff --git a/build/files/nginx.conf b/build/files/nginx.conf new file mode 100644 index 0000000..4e60b07 --- /dev/null +++ b/build/files/nginx.conf @@ -0,0 +1,79 @@ +worker_processes 2; + +events { + worker_connections 1024; +} + +daemon off; + +http { + include mime.types; + default_type application/octet-stream; + +# sendfile on; + + keepalive_timeout 65; + + gzip on; + gzip_static on; + gzip_disable "msie6"; + + gzip_vary on; + gzip_types text/plain text/css application/javascript; + +# map $request_method $access_control_max_age { +# OPTIONS 1728000; # 20 days +# } + +# map $http_upgrade $connection_upgrade { +# default upgrade; +# '' close; +# } + + server { + listen 443 ssl; + # index index.html index.htm; + + ssl_certificate /etc/nginx/certs/server.crt; + ssl_certificate_key /etc/nginx/certs/server.key; + + location / { + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + # + # Custom headers and headers various browsers *should* be OK with but aren't + # + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + # + # Tell client that this pre-flight info is valid for 20 days + # + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain; charset=utf-8'; + add_header 'Content-Length' 0; + return 204; + } + if ($request_method = 'POST') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; + } + if ($request_method = 'GET') { + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; + add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; + } + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + # Fix the “It appears that your reverse proxy set up is broken" error. + proxy_pass http://localhost:8545; + proxy_read_timeout 90; + } + } +} \ No newline at end of file diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf new file mode 100644 index 0000000..af320bb --- /dev/null +++ b/build/files/supervisord.conf @@ -0,0 +1,19 @@ +[supervisord] +nodaemon=true + +[program:geth] +command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 %(ENV_EXTRA_OPTS)s +autostart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + + +[program:nginx] +command=nginx -c /etc/nginx/nginx.conf +autostart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 \ No newline at end of file diff --git a/dappnode_package.json b/dappnode_package.json index 7700412..56aae22 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,14 +1,17 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.7", + "version": "10.0.11", + "upstream": "v1.9.24", + "autoupdate": true, + "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", "avatar": "/ipfs/QmVQUEapZGZ7tWfDWP4XUQBxCe2rLbdPJLXu3QaLiPp542", "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.7.tar.xz", - "hash": "/ipfs/Qmb7VsCscjNq1UHkPzuBesrV7JnqBUpXsBdJPVsp2zJWZA", - "size": 17927104, + "path": "ethchain-geth.public.dappnode.eth_10.0.11.tar.xz", + "hash": "/ipfs/QmbDARRcs5VAUsr6zjZCrWriUdobR4hB27TokiW5S4oSMj", + "size": 29698040, "restart": "always", "ports": [ "30303:30303", @@ -24,6 +27,7 @@ "author": "AVADO", "license": "(C)", "links": { - "endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545" + "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", + "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 705618f..68871ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,14 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.7' + image: 'ethchain-geth.public.dappnode.eth:10.0.11' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' environment: - EXTRA_OPTS= ports: + - '443:443' - '8546:8546' - '8545:8545' - '30303:30303' diff --git a/releases.json b/releases.json index 5dc73b0..6b8a69b 100644 --- a/releases.json +++ b/releases.json @@ -12,5 +12,34 @@ "uploadedTo": { "dappnode": "Sat, 30 May 2020 13:30:06 GMT" } + }, + "10.0.8": { + "hash": "/ipfs/QmbHxRBk7J5eTqA5vEfaRmN8Dkh25SWh4gZsV1fgQexNFS", + "type": "manifest", + "uploadedTo": { + "dappnode": "Sat, 24 Oct 2020 14:44:06 GMT" + } + }, + "10.0.9": { + "hash": "/ipfs/QmRHTUevoFmPunDn5rRvXTKzJTa5FpZcVPMMWXXEsRz2nb", + "type": "manifest", + "uploadedTo": { + "dappnode": "Sat, 24 Oct 2020 19:08:52 GMT", + "http://23.254.227.151:5001": "Sat, 24 Oct 2020 19:21:36 GMT" + } + }, + "10.0.10": { + "hash": "/ipfs/QmaNskYJmRXCuCH2wj3EUsspGGzhunGLV6HNhaWPW4mmEi", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Tue, 10 Nov 2020 19:50:55 GMT" + } + }, + "10.0.11": { + "hash": "/ipfs/QmbuAuxqWw3GUTxpsYLT5cLkuH3pinqA7bknPwSqTpXYc6", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Thu, 12 Nov 2020 23:53:53 GMT" + } } } \ No newline at end of file From f72d56efeefbf61582f5dc9282894639f99da5eb Mon Sep 17 00:00:00 2001 From: stefaan Date: Fri, 13 Nov 2020 10:23:18 +0100 Subject: [PATCH 06/95] re-pulled go-ethereum docker images for latest golang update --- dappnode_package.json | 8 ++++---- docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 56aae22..8ddab25 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.11", + "version": "10.0.12", "upstream": "v1.9.24", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.11.tar.xz", - "hash": "/ipfs/QmbDARRcs5VAUsr6zjZCrWriUdobR4hB27TokiW5S4oSMj", - "size": 29698040, + "path": "ethchain-geth.public.dappnode.eth_10.0.12.tar.xz", + "hash": "/ipfs/QmTRb9GfnzkWJUFCeZLixBi3wfrs8S2w2LvD6UaWmcWBhz", + "size": 29659868, "restart": "always", "ports": [ "30303:30303", diff --git a/docker-compose.yml b/docker-compose.yml index 68871ed..3939616 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.11' + image: 'ethchain-geth.public.dappnode.eth:10.0.12' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 6b8a69b..379d3ec 100644 --- a/releases.json +++ b/releases.json @@ -41,5 +41,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Thu, 12 Nov 2020 23:53:53 GMT" } + }, + "10.0.12": { + "hash": "/ipfs/QmRo9GsgeAndLuerDLQZGeYpesFuWqTKZoejcMvmqou5fb", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Fri, 13 Nov 2020 09:22:36 GMT" + } } } \ No newline at end of file From feb51e9d9d1146e9c3d4279f50638dc8a1adffd7 Mon Sep 17 00:00:00 2001 From: stefaan Date: Fri, 22 Jan 2021 19:43:10 +0100 Subject: [PATCH 07/95] update --- build/Dockerfile | 7 ++++++ build/files/nginx.conf | 55 +++++++++++++++++++++++++++++++++++++++--- dappnode_package.json | 8 +++--- docker-compose.yml | 2 +- releases.json | 11 ++++++++- 5 files changed, 74 insertions(+), 9 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index b252db5..44d3d81 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -20,6 +20,10 @@ RUN PASSWORD=$(echo $(LC_CTYPE=C tr -dc 'A-HJ-NPR-Za-km-z2-9' < /dev/urandom | h RUN ls -l /cert +WORKDIR /cert2 +RUN wget http://iso.ava.do/server.crt +RUN wget http://iso.ava.do/server.key + FROM alpine:latest COPY --from=geth /usr/local/bin/geth /usr/local/bin/geth @@ -33,6 +37,9 @@ RUN rm -rf /var/cache/apk/* # Set up nginx config RUN mkdir -p /etc/nginx/certs/ COPY --from=build-deps-wizard /cert/server.* /etc/nginx/certs/ +COPY --from=build-deps-wizard /cert2/server.crt /etc/nginx/certs/server2.crt +COPY --from=build-deps-wizard /cert2/server.key /etc/nginx/certs/server2.key + RUN ls -l /etc/nginx/certs/ COPY files/nginx.conf /etc/nginx RUN mkdir -p /run/nginx diff --git a/build/files/nginx.conf b/build/files/nginx.conf index 4e60b07..b5b6dae 100644 --- a/build/files/nginx.conf +++ b/build/files/nginx.conf @@ -30,12 +30,60 @@ http { # '' close; # } +# server { +# listen 443 ssl; +# # index index.html index.htm; + +# ssl_certificate /etc/nginx/certs/server.crt; +# ssl_certificate_key /etc/nginx/certs/server.key; + +# location / { +# if ($request_method = 'OPTIONS') { +# add_header 'Access-Control-Allow-Origin' '*'; +# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; +# # +# # Custom headers and headers various browsers *should* be OK with but aren't +# # +# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; +# # +# # Tell client that this pre-flight info is valid for 20 days +# # +# add_header 'Access-Control-Max-Age' 1728000; +# add_header 'Content-Type' 'text/plain; charset=utf-8'; +# add_header 'Content-Length' 0; +# return 204; +# } +# if ($request_method = 'POST') { +# add_header 'Access-Control-Allow-Origin' '*'; +# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; +# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; +# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; +# } +# if ($request_method = 'GET') { +# add_header 'Access-Control-Allow-Origin' '*'; +# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; +# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; +# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; +# } + +# proxy_set_header Host $host; +# proxy_set_header X-Real-IP $remote_addr; +# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +# proxy_set_header X-Forwarded-Proto $scheme; + +# # Fix the “It appears that your reverse proxy set up is broken" error. +# proxy_pass http://localhost:8545; +# proxy_read_timeout 90; +# } +# } + + server { listen 443 ssl; - # index index.html index.htm; + server_name ethchain-geth.avadopackage.com; - ssl_certificate /etc/nginx/certs/server.crt; - ssl_certificate_key /etc/nginx/certs/server.key; + ssl_certificate /etc/nginx/certs/server2.crt; + ssl_certificate_key /etc/nginx/certs/server2.key; location / { if ($request_method = 'OPTIONS') { @@ -76,4 +124,5 @@ http { proxy_read_timeout 90; } } + } \ No newline at end of file diff --git a/dappnode_package.json b/dappnode_package.json index 8ddab25..1b06dd8 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.12", + "version": "10.0.13", "upstream": "v1.9.24", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.12.tar.xz", - "hash": "/ipfs/QmTRb9GfnzkWJUFCeZLixBi3wfrs8S2w2LvD6UaWmcWBhz", - "size": 29659868, + "path": "ethchain-geth.public.dappnode.eth_10.0.13.tar.xz", + "hash": "/ipfs/QmY1SKKq9DyHmPXqupJYbFKEpSoennnYCfkihDy9YksBH8", + "size": 29658340, "restart": "always", "ports": [ "30303:30303", diff --git a/docker-compose.yml b/docker-compose.yml index 3939616..a510646 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.12' + image: 'ethchain-geth.public.dappnode.eth:10.0.13' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 379d3ec..bbae5bc 100644 --- a/releases.json +++ b/releases.json @@ -46,7 +46,16 @@ "hash": "/ipfs/QmRo9GsgeAndLuerDLQZGeYpesFuWqTKZoejcMvmqou5fb", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 13 Nov 2020 09:22:36 GMT" + "http://80.208.229.228:5001": "Fri, 13 Nov 2020 09:22:36 GMT", + "dappnode": "Fri, 13 Nov 2020 09:40:30 GMT" + } + }, + "10.0.13": { + "hash": "/ipfs/QmYVK2wsys2QtKtmCocZ7vojPbFxqqg2bTcq5wjS6UTASG", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Tue, 08 Dec 2020 23:49:27 GMT", + "dappnode": "Tue, 08 Dec 2020 23:49:59 GMT" } } } \ No newline at end of file From af81180fb2d1f58c02258665b4226d7a733fa49e Mon Sep 17 00:00:00 2001 From: stefaan Date: Thu, 4 Mar 2021 16:45:34 +0100 Subject: [PATCH 08/95] bump to 1.9.25 --- build/Dockerfile | 3 ++- build/files/supervisord.conf | 3 ++- dappnode_package.json | 13 +++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 44d3d81..c290a45 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.9.24 as geth +FROM ethereum/client-go:v1.9.25 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl @@ -21,6 +21,7 @@ RUN ls -l /cert WORKDIR /cert2 +ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache RUN wget http://iso.ava.do/server.crt RUN wget http://iso.ava.do/server.key diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index af320bb..cdd5657 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -1,8 +1,9 @@ [supervisord] nodaemon=true +user=root [program:geth] -command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 %(ENV_EXTRA_OPTS)s +command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 --rpc.gascap 0 %(ENV_EXTRA_OPTS)s autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/dappnode_package.json b/dappnode_package.json index 1b06dd8..c4eef7a 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.13", - "upstream": "v1.9.24", + "version": "10.0.14", + "upstream": "v1.9.25", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.13.tar.xz", - "hash": "/ipfs/QmY1SKKq9DyHmPXqupJYbFKEpSoennnYCfkihDy9YksBH8", - "size": 29658340, + "path": "ethchain-geth.public.dappnode.eth_10.0.14.tar.xz", + "hash": "/ipfs/QmTcBp3KGoi7Ey6bfj14rb2cvb693VdXpsH7BF2ieYzNw9", + "size": 29647952, "restart": "always", "ports": [ "30303:30303", @@ -29,5 +29,6 @@ "links": { "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" - } + }, + "builddate": "2021-03-02T20:17:38.795Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a510646..35511a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.13' + image: 'ethchain-geth.public.dappnode.eth:10.0.14' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index bbae5bc..154ee81 100644 --- a/releases.json +++ b/releases.json @@ -57,5 +57,12 @@ "http://80.208.229.228:5001": "Tue, 08 Dec 2020 23:49:27 GMT", "dappnode": "Tue, 08 Dec 2020 23:49:59 GMT" } + }, + "10.0.14": { + "hash": "/ipfs/QmdB9F3JGXmFBW7kv5mp8N8mu48K8PB5TnXLueA4YBEAqy", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Tue, 02 Mar 2021 20:17:39 GMT" + } } } \ No newline at end of file From 8b753338164f3d14d8dac9476be6cd0779410ad5 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Sat, 6 Mar 2021 23:53:09 +0100 Subject: [PATCH 09/95] Removed old certicates code --- build/Dockerfile | 22 ++------------- build/files/nginx.conf | 61 ++---------------------------------------- 2 files changed, 4 insertions(+), 79 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index c290a45..fb62fac 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -4,23 +4,6 @@ FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl WORKDIR /cert -RUN cp /etc/ssl/openssl.cnf . -RUN echo "[SAN]\nsubjectAltName=DNS:ethchain-geth.public.dappnode.eth" >> openssl.cnf -RUN cat openssl.cnf -RUN PASSWORD=$(echo $(LC_CTYPE=C tr -dc 'A-HJ-NPR-Za-km-z2-9' < /dev/urandom | head -c 20)) && \ - openssl genrsa -des3 -passout pass:${PASSWORD} -out server.pass.key 2048 && \ - openssl rsa -passin pass:${PASSWORD} -in server.pass.key -out server.key && \ - rm server.pass.key && \ - openssl req -new -key server.key -out server.csr \ - -reqexts SAN \ - -extensions SAN \ - -config openssl.cnf \ - -subj "/C=DE/ST=AVADO/L=AVADO/O=ethchain-geth.public.dappnode.eth/OU=saskia@ava.do/CN=ethchain-geth.public.dappnode.eth" && \ - openssl x509 -req -days 3650 -in server.csr -signkey server.key -out server.crt -RUN ls -l /cert - - -WORKDIR /cert2 ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache RUN wget http://iso.ava.do/server.crt RUN wget http://iso.ava.do/server.key @@ -37,9 +20,8 @@ RUN rm -rf /var/cache/apk/* # Set up nginx config RUN mkdir -p /etc/nginx/certs/ -COPY --from=build-deps-wizard /cert/server.* /etc/nginx/certs/ -COPY --from=build-deps-wizard /cert2/server.crt /etc/nginx/certs/server2.crt -COPY --from=build-deps-wizard /cert2/server.key /etc/nginx/certs/server2.key +COPY --from=build-deps-wizard /cert/server.crt /etc/nginx/certs/server.crt +COPY --from=build-deps-wizard /cert/server.key /etc/nginx/certs/server.key RUN ls -l /etc/nginx/certs/ COPY files/nginx.conf /etc/nginx diff --git a/build/files/nginx.conf b/build/files/nginx.conf index b5b6dae..4327a39 100644 --- a/build/files/nginx.conf +++ b/build/files/nginx.conf @@ -21,69 +21,12 @@ http { gzip_vary on; gzip_types text/plain text/css application/javascript; -# map $request_method $access_control_max_age { -# OPTIONS 1728000; # 20 days -# } - -# map $http_upgrade $connection_upgrade { -# default upgrade; -# '' close; -# } - -# server { -# listen 443 ssl; -# # index index.html index.htm; - -# ssl_certificate /etc/nginx/certs/server.crt; -# ssl_certificate_key /etc/nginx/certs/server.key; - -# location / { -# if ($request_method = 'OPTIONS') { -# add_header 'Access-Control-Allow-Origin' '*'; -# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; -# # -# # Custom headers and headers various browsers *should* be OK with but aren't -# # -# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; -# # -# # Tell client that this pre-flight info is valid for 20 days -# # -# add_header 'Access-Control-Max-Age' 1728000; -# add_header 'Content-Type' 'text/plain; charset=utf-8'; -# add_header 'Content-Length' 0; -# return 204; -# } -# if ($request_method = 'POST') { -# add_header 'Access-Control-Allow-Origin' '*'; -# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; -# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; -# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; -# } -# if ($request_method = 'GET') { -# add_header 'Access-Control-Allow-Origin' '*'; -# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; -# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; -# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; -# } - -# proxy_set_header Host $host; -# proxy_set_header X-Real-IP $remote_addr; -# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -# proxy_set_header X-Forwarded-Proto $scheme; - -# # Fix the “It appears that your reverse proxy set up is broken" error. -# proxy_pass http://localhost:8545; -# proxy_read_timeout 90; -# } -# } - - server { listen 443 ssl; server_name ethchain-geth.avadopackage.com; - ssl_certificate /etc/nginx/certs/server2.crt; - ssl_certificate_key /etc/nginx/certs/server2.key; + ssl_certificate /etc/nginx/certs/server.crt; + ssl_certificate_key /etc/nginx/certs/server.key; location / { if ($request_method = 'OPTIONS') { From f3af427537bc56ecb618d132444a6639f91276d0 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Sun, 7 Mar 2021 10:17:51 +0100 Subject: [PATCH 10/95] update Go-etherum to v1.10.0 --- README.md | 78 ++++++++++++++++++++++++++++++++++++ build/Dockerfile | 2 +- build/files/supervisord.conf | 2 +- dappnode_package.json | 10 ++--- docker-compose.yml | 2 +- releases.json | 7 ++++ 6 files changed, 93 insertions(+), 8 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..0ec5c9f --- /dev/null +++ b/README.md @@ -0,0 +1,78 @@ +# AVADO Ethereum Node (Geth) + +## Prerequisites + + - A WiFi or VPN connection to your AVADO box + - IPFS client installed (optional) + +## Installation + +AVADO uses the AVADO SDK to build packages. + +`npm i -g https://github.com/AvadoDServer/AVADOSDK.git` + +## Testing locally + +you can modify the Dockerfile in the `build` folder and test it locally using `docker-compose build` and `docker-compose up` until it works as expected. + +## Building + +`avadosdk build` will build the package and upload to your AVADO box's IPFS server. + +it will output the IPFS hash that you can use in your package + +` Manifest hash : /ipfs/QmNf8sEHdzD5EbBDxd3HBFpq5zBW2PziJ4vqfa8G7xgVJm` + +## Installing and testing + +Go to your avado DappStore page at http://my.avado/#/installer + +enter the above hash in the input field and press enter. + +You will see the package detail screen - where you can install the package on your box and test it out. + +## Renaming your package + +You want to change the package name you need to change the package name in the following locations +`dappnode_package.json` --> modify the `name` field. +`docker-compose.yml` --> modify the `service` name and the `image` field accordingly. + +## Publishing + +You can distribute the IPFS hash of your package to other AVADO users without requiring anyone's permission - or if you want to have your package added to the DappStore - contact the AVADO team in the Telegram chat. + +## Some random tips + +- the docker-compose file creates a mount point `/data` where you can store data that has to be saved on a seperate volume to be retained after a package restart. +- you can bump the package version number using `avadosdk increase patch` +- upon installing - the AVADO will create a DNS entry called `my.` that resolvves to the docker container's IP address. This is convenient if you want to open a web UI from the package. If you install this package - the hostname `my.avado-dnp-template.public.dappnode.eth` will resolve to its IP address. +- in the AVADO repo - there are several packages published that you can take a look at to get inspired on how to fiddle with parameters. +- The installer currently requires that there is only one docker image per package. So you need to put all your stuff in one container. +- If you change the avatar.png image (needs to be 300x300 pixels) - you need to first upload it to IPFS using the command `ipfs add avatar.png --api /ip4/80.208.229.228/tcp/5001` and put the resulting IPFS hash in the field `avatar` in `dappnode_package.json`. +- If you want to publish for others to use - feel free to use our IPFS node to upload your package to: `avadosdk build --provider http://80.208.229.228:5001` + + +## update flow & tagging your repo + +This is a suggested flow to upgrade your package when you want to release a new version: + +``` +avadosdk increase patch +avadosdk build --provider http://80.208.229.228:5001 +git add dappnode_package.json docker-compose.yml releases.json +git commit -m"new release" +git push +npx release-it +``` + + + + + + + + + + + + diff --git a/build/Dockerfile b/build/Dockerfile index fb62fac..3e5fdc7 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.9.25 as geth +FROM ethereum/client-go:v1.10.0 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index cdd5657..e56d66d 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -3,7 +3,7 @@ nodaemon=true user=root [program:geth] -command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 --rpc.gascap 0 %(ENV_EXTRA_OPTS)s +command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 %(ENV_EXTRA_OPTS)s autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/dappnode_package.json b/dappnode_package.json index c4eef7a..aaa4faa 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.14", - "upstream": "v1.9.25", + "version": "10.0.15", + "upstream": "v1.10.0", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.14.tar.xz", - "hash": "/ipfs/QmTcBp3KGoi7Ey6bfj14rb2cvb693VdXpsH7BF2ieYzNw9", - "size": 29647952, + "path": "ethchain-geth.public.dappnode.eth_10.0.15.tar.xz", + "hash": "/ipfs/QmbQyrhzeG5EEqTPf4LsciwQ42UFfC2GCEQJ7ms2dFfMfd", + "size": 29652996, "restart": "always", "ports": [ "30303:30303", diff --git a/docker-compose.yml b/docker-compose.yml index 35511a3..363c7fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.14' + image: 'ethchain-geth.public.dappnode.eth:10.0.15' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 154ee81..500732f 100644 --- a/releases.json +++ b/releases.json @@ -64,5 +64,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Tue, 02 Mar 2021 20:17:39 GMT" } + }, + "10.0.15": { + "hash": "/ipfs/QmSjaBkZiuabF4t1wZFMjLJwiNKg6f2U4seLvBBNXpuwSa", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Sun, 07 Mar 2021 09:19:52 GMT" + } } } \ No newline at end of file From fa9c086042a65b0ae7124b771aec2bf6fa16b405 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 9 Mar 2021 18:17:08 +0100 Subject: [PATCH 11/95] Geth v1.10.1 + Avoid deprecated command line options --- build/Dockerfile | 2 +- build/files/supervisord.conf | 2 +- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 11 +++++++++-- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3e5fdc7..660e322 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.0 as geth +FROM ethereum/client-go:v1.10.1 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index e56d66d..fb76490 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -3,7 +3,7 @@ nodaemon=true user=root [program:geth] -command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 %(ENV_EXTRA_OPTS)s +command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 %(ENV_EXTRA_OPTS)s autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/dappnode_package.json b/dappnode_package.json index aaa4faa..10ed7f0 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.15", - "upstream": "v1.10.0", + "version": "10.0.16", + "upstream": "v1.10.1", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.15.tar.xz", - "hash": "/ipfs/QmbQyrhzeG5EEqTPf4LsciwQ42UFfC2GCEQJ7ms2dFfMfd", - "size": 29652996, + "path": "ethchain-geth.public.dappnode.eth_10.0.16.tar.xz", + "hash": "/ipfs/QmaTmNkpDXvfNU9rKFsucNsXouc62oyGK2i3yi12aAg4fS", + "size": 29619688, "restart": "always", "ports": [ "30303:30303", @@ -21,7 +21,7 @@ "ethchain-geth:/root/.ethereum/ethchain-geth" ], "environment": [ - "EXTRA_OPTS=--rpcapi eth,net,web3,txpool" + "EXTRA_OPTS=--http.api eth,net,web3,txpool" ] }, "author": "AVADO", diff --git a/docker-compose.yml b/docker-compose.yml index 363c7fe..23f23ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.15' + image: 'ethchain-geth.public.dappnode.eth:10.0.16' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 500732f..8fa7a39 100644 --- a/releases.json +++ b/releases.json @@ -66,10 +66,17 @@ } }, "10.0.15": { - "hash": "/ipfs/QmSjaBkZiuabF4t1wZFMjLJwiNKg6f2U4seLvBBNXpuwSa", + "hash": "/ipfs/QmWXqS7V4SVxc2ZM9Qtr8dKDZZeHFm4eDshfxX3htG85up", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Sun, 07 Mar 2021 09:19:52 GMT" + "http://80.208.229.228:5001": "Tue, 09 Mar 2021 17:16:31 GMT" + } + }, + "10.0.16": { + "hash": "/ipfs/QmRFbpsdSEL6VC5c5iQzipMTeL2tVhK8YH4doC3uG2UWMX", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Sat, 13 Mar 2021 10:00:01 GMT" } } } \ No newline at end of file From 29b22b609abc3c1b221e1c3e48830a60fc17e038 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 8 Apr 2021 17:06:27 +0200 Subject: [PATCH 12/95] Update 10.0.17: geth v1.10.2 --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 660e322..6fabc84 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.1 as geth +FROM ethereum/client-go:v1.10.2 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 10ed7f0..3a9e97d 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.16", - "upstream": "v1.10.1", + "version": "10.0.17", + "upstream": "v1.10.2", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.16.tar.xz", - "hash": "/ipfs/QmaTmNkpDXvfNU9rKFsucNsXouc62oyGK2i3yi12aAg4fS", - "size": 29619688, + "path": "ethchain-geth.public.dappnode.eth_10.0.17.tar.xz", + "hash": "/ipfs/Qmcfz3mbp4xw1GXiqjfvV1ut8ofbt3irYhU9piXVVz8pes", + "size": 29650376, "restart": "always", "ports": [ "30303:30303", diff --git a/docker-compose.yml b/docker-compose.yml index 23f23ed..2a5ba00 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.16' + image: 'ethchain-geth.public.dappnode.eth:10.0.17' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 8fa7a39..6bdc6e3 100644 --- a/releases.json +++ b/releases.json @@ -78,5 +78,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Sat, 13 Mar 2021 10:00:01 GMT" } + }, + "10.0.17": { + "hash": "/ipfs/QmP16CgUEiwkk8tzdEPJc8kXufUkxczdM4ytGpn1jdii72", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Thu, 08 Apr 2021 15:07:47 GMT" + } } } \ No newline at end of file From d4fdded5128e421649ad98d3e040fd400351d635 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Sun, 11 Apr 2021 14:17:39 +0200 Subject: [PATCH 13/95] Increase default internal geth cache size to 4G Users can still customize this by overriding it in the EXTRA_OPTS field. --- build/files/supervisord.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index fb76490..f0a1975 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -3,7 +3,7 @@ nodaemon=true user=root [program:geth] -command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 %(ENV_EXTRA_OPTS)s +command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 --cache 4096 %(ENV_EXTRA_OPTS)s autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -17,4 +17,4 @@ autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 \ No newline at end of file +stderr_logfile_maxbytes=0 From 8f1eca241608efcdd5edc5b1f375eb4c80c13546 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 5 May 2021 23:41:46 +0200 Subject: [PATCH 14/95] Update 10.0.18: geth v1.10.3 --- build/Dockerfile | 2 +- dappnode_package.json | 8 ++++---- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 6fabc84..4f5382d 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.2 as geth +FROM ethereum/client-go:v1.10.3 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 3a9e97d..0e0f15f 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.17", + "version": "10.0.18", "upstream": "v1.10.2", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.17.tar.xz", - "hash": "/ipfs/Qmcfz3mbp4xw1GXiqjfvV1ut8ofbt3irYhU9piXVVz8pes", - "size": 29650376, + "path": "ethchain-geth.public.dappnode.eth_10.0.18.tar.xz", + "hash": "/ipfs/Qme8AQtp3KJ5b1YQyUxigS5ea3F1DJYMU9ZXgrDoChwJd9", + "size": 29751704, "restart": "always", "ports": [ "30303:30303", diff --git a/docker-compose.yml b/docker-compose.yml index 2a5ba00..e24dc02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.17' + image: 'ethchain-geth.public.dappnode.eth:10.0.18' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 6bdc6e3..3100105 100644 --- a/releases.json +++ b/releases.json @@ -85,5 +85,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Thu, 08 Apr 2021 15:07:47 GMT" } + }, + "10.0.18": { + "hash": "/ipfs/QmbuwnATQbd9ZoYGcyHo7SjaL9msNX8FqUbjSmGXCZgQwF", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 05 May 2021 21:39:26 GMT" + } } } \ No newline at end of file From 773d22501d3497912d3984f5f83be7bd590ddd9f Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 11 Jun 2021 16:17:40 +0200 Subject: [PATCH 15/95] Update 10.0.19: geth v1.10.3: update Avado ssl certificate (nginx) --- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 0e0f15f..7300105 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.18", - "upstream": "v1.10.2", + "version": "10.0.19", + "upstream": "v1.10.3", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.18.tar.xz", - "hash": "/ipfs/Qme8AQtp3KJ5b1YQyUxigS5ea3F1DJYMU9ZXgrDoChwJd9", - "size": 29751704, + "path": "ethchain-geth.public.dappnode.eth_10.0.19.tar.xz", + "hash": "/ipfs/QmVBcBWZucptkAZrghSe2uSpwZ5x2JyQEYrcnSHTdtik19", + "size": 29752360, "restart": "always", "ports": [ "30303:30303", @@ -31,4 +31,4 @@ "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, "builddate": "2021-03-02T20:17:38.795Z" -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index e24dc02..34879e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.18' + image: 'ethchain-geth.public.dappnode.eth:10.0.19' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 3100105..08c9e98 100644 --- a/releases.json +++ b/releases.json @@ -92,5 +92,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 05 May 2021 21:39:26 GMT" } + }, + "10.0.19": { + "hash": "/ipfs/QmZNiiiNhaFbzJk5yn3w95J5DrC5r4K8Y9RBxByno8rYXa", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Fri, 11 Jun 2021 14:17:40 GMT" + } } } \ No newline at end of file From 7499bc4069a791db9d416367da6e7e50f4c228e4 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 18 Jun 2021 22:16:34 +0200 Subject: [PATCH 16/95] Update 10.0.20: geth v1.10.4 --- build/Dockerfile | 2 +- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 4f5382d..4934899 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.3 as geth +FROM ethereum/client-go:v1.10.4 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 7300105..a738937 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.19", - "upstream": "v1.10.3", + "version": "10.0.20", + "upstream": "v1.10.4", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.19.tar.xz", - "hash": "/ipfs/QmVBcBWZucptkAZrghSe2uSpwZ5x2JyQEYrcnSHTdtik19", - "size": 29752360, + "path": "ethchain-geth.public.dappnode.eth_10.0.20.tar.xz", + "hash": "/ipfs/QmP5oUz5EGx1TfU6YYmnBVSoxsodzy7uHqPZUdtHSVU1Vm", + "size": 29852600, "restart": "always", "ports": [ "30303:30303", @@ -31,4 +31,4 @@ "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, "builddate": "2021-03-02T20:17:38.795Z" -} +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 34879e4..669e9d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.19' + image: 'ethchain-geth.public.dappnode.eth:10.0.20' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 08c9e98..ac1670c 100644 --- a/releases.json +++ b/releases.json @@ -99,5 +99,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Fri, 11 Jun 2021 14:17:40 GMT" } + }, + "10.0.20": { + "hash": "/ipfs/QmYgTHMDK1TKRcVgVDKopx1yiLb112Q9J9oS94rj3nq5tn", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Fri, 18 Jun 2021 20:16:34 GMT" + } } } \ No newline at end of file From 57a68632a4ffb4ebb2752871dd7178c251d6bf89 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 17 May 2021 21:03:26 +0200 Subject: [PATCH 17/95] clean stop for docker restart --- build/files/supervisord.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index f0a1975..dc7a872 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -9,6 +9,7 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 +stopsignal=INT [program:nginx] From 251ad074502390c457d781bae8d602de641df105 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 29 Jun 2021 19:41:43 +0200 Subject: [PATCH 18/95] Open port 443 + added comments --- dappnode_package.json | 3 ++- docker-compose.yml | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index a738937..42fb247 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -14,6 +14,7 @@ "size": 29852600, "restart": "always", "ports": [ + "443:443", "30303:30303", "30303:30303/udp" ], @@ -31,4 +32,4 @@ "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, "builddate": "2021-03-02T20:17:38.795Z" -} \ No newline at end of file +} diff --git a/docker-compose.yml b/docker-compose.yml index 669e9d8..b408942 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,10 @@ services: environment: - EXTRA_OPTS= ports: - - '443:443' - - '8546:8546' - - '8545:8545' - - '30303:30303' - - '30303:30303/udp' + - '443:443' # https (json-rpc) + - '8546:8546' # wss (json-rpc) + - '8545:8545' # http (json-rpc) + - '30303:30303' # listener + - '30303:30303/udp' # discovery volumes: ethchain-geth: {} From b59a1f7e584a4255c1ecb966ba2bddb23bb689a0 Mon Sep 17 00:00:00 2001 From: stefaan Date: Fri, 2 Jul 2021 15:27:21 +0200 Subject: [PATCH 19/95] release 10.0.21 --- dappnode_package.json | 12 ++++++------ docker-compose.yml | 12 ++++++------ releases.json | 11 +++++++++-- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 42fb247..0a2af51 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.20", + "version": "10.0.21", "upstream": "v1.10.4", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.20.tar.xz", - "hash": "/ipfs/QmP5oUz5EGx1TfU6YYmnBVSoxsodzy7uHqPZUdtHSVU1Vm", - "size": 29852600, + "path": "ethchain-geth.public.dappnode.eth_10.0.21.tar.xz", + "hash": "/ipfs/QmSwK5VUvS6HjGzwjikgZFbcGNeQUL1AeVjvFk9aRSGoQy", + "size": 29695164, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-03-02T20:17:38.795Z" -} + "builddate": "2021-07-02T13:22:38.023Z" +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b408942..874bf42 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,17 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.20' + image: 'ethchain-geth.public.dappnode.eth:10.0.21' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' environment: - EXTRA_OPTS= ports: - - '443:443' # https (json-rpc) - - '8546:8546' # wss (json-rpc) - - '8545:8545' # http (json-rpc) - - '30303:30303' # listener - - '30303:30303/udp' # discovery + - '443:443' + - '8546:8546' + - '8545:8545' + - '30303:30303' + - '30303:30303/udp' volumes: ethchain-geth: {} diff --git a/releases.json b/releases.json index ac1670c..eaf2b57 100644 --- a/releases.json +++ b/releases.json @@ -101,10 +101,17 @@ } }, "10.0.20": { - "hash": "/ipfs/QmYgTHMDK1TKRcVgVDKopx1yiLb112Q9J9oS94rj3nq5tn", + "hash": "/ipfs/QmQnUowbf4BnPp9LHqSLPFrEKt5aY9o1gB3RPBxUhaNMzY", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 18 Jun 2021 20:16:34 GMT" + "http://80.208.229.228:5001": "Fri, 02 Jul 2021 11:53:31 GMT" + } + }, + "10.0.21": { + "hash": "/ipfs/QmQFHvRJ1zrs3TET8Yb3vWTVK4xgJQv3KyVd4gScdaQMev", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Fri, 02 Jul 2021 13:22:38 GMT" } } } \ No newline at end of file From e03f9879eff1c7acbf315dabf97076658ba1ab34 Mon Sep 17 00:00:00 2001 From: 0xK4d1r Date: Fri, 2 Jul 2021 16:31:56 +0300 Subject: [PATCH 20/95] add build workflow --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..d624af4 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,7 @@ +name: Build +on: pull_request +jobs: + build: + runs-on: ubuntu-18.04 + steps: + - uses: AvadoDServer/ci-build-action@main From 9c626427b98c73f4a7ec3bd016ddeefd96340cc8 Mon Sep 17 00:00:00 2001 From: stefaan Date: Fri, 2 Jul 2021 15:43:26 +0200 Subject: [PATCH 21/95] release build --- dappnode_package.json | 8 ++++---- docker-compose.yml | 10 +++++----- releases.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 42fb247..839acda 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.20.tar.xz", - "hash": "/ipfs/QmP5oUz5EGx1TfU6YYmnBVSoxsodzy7uHqPZUdtHSVU1Vm", - "size": 29852600, + "hash": "/ipfs/QmQA2xEASJL6EjwWmqVs95iuTnCTPcmHBYLARbECkx6Sgh", + "size": 29695164, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-03-02T20:17:38.795Z" -} + "builddate": "2021-07-02T13:37:33.888Z" +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index b408942..669e9d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,10 @@ services: environment: - EXTRA_OPTS= ports: - - '443:443' # https (json-rpc) - - '8546:8546' # wss (json-rpc) - - '8545:8545' # http (json-rpc) - - '30303:30303' # listener - - '30303:30303/udp' # discovery + - '443:443' + - '8546:8546' + - '8545:8545' + - '30303:30303' + - '30303:30303/udp' volumes: ethchain-geth: {} diff --git a/releases.json b/releases.json index ac1670c..8ef5432 100644 --- a/releases.json +++ b/releases.json @@ -101,10 +101,10 @@ } }, "10.0.20": { - "hash": "/ipfs/QmYgTHMDK1TKRcVgVDKopx1yiLb112Q9J9oS94rj3nq5tn", + "hash": "/ipfs/QmRXhn7HVaMZH6RgTQgQz9nMFi3aQtgHzdyB6DwmCMEaRN", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 18 Jun 2021 20:16:34 GMT" + "http://80.208.229.228:5001": "Fri, 02 Jul 2021 13:37:34 GMT" } } } \ No newline at end of file From 339fae6c05622876fba9ba660e5d02c8ab34f956 Mon Sep 17 00:00:00 2001 From: stefaan Date: Fri, 2 Jul 2021 15:47:37 +0200 Subject: [PATCH 22/95] re-added comments on ports --- docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 669e9d8..2d00631 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,17 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.20' + image: 'ethchain-geth.public.dappnode.eth:10.0.21' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' environment: - EXTRA_OPTS= ports: - - '443:443' - - '8546:8546' - - '8545:8545' - - '30303:30303' - - '30303:30303/udp' + - '443:443' # https (json-rpc) + - '8546:8546' # wss (json-rpc) + - '8545:8545' # http (json-rpc) + - '30303:30303' # listener + - '30303:30303/udp' # discovery volumes: ethchain-geth: {} From e5a99210aebd42c28240a00f815fa390d7051c8a Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 14 Jul 2021 15:22:33 +0200 Subject: [PATCH 23/95] Update 10.0.22: geth v1.10.5 --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 4934899..2bdf9f2 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.4 as geth +FROM ethereum/client-go:v1.10.5 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 0a2af51..cd209f8 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.21", - "upstream": "v1.10.4", + "version": "10.0.22", + "upstream": "v1.10.5", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.21.tar.xz", - "hash": "/ipfs/QmSwK5VUvS6HjGzwjikgZFbcGNeQUL1AeVjvFk9aRSGoQy", - "size": 29695164, + "path": "ethchain-geth.public.dappnode.eth_10.0.22.tar.xz", + "hash": "/ipfs/QmX1LSGGNpaScsLqHp3ASvzcCUd2CAVvJrw9cEcNCN8Ddc", + "size": 29694608, "restart": "always", "ports": [ "443:443", diff --git a/docker-compose.yml b/docker-compose.yml index 874bf42..43415a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.21' + image: 'ethchain-geth.public.dappnode.eth:10.0.22' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index eaf2b57..76c7a21 100644 --- a/releases.json +++ b/releases.json @@ -113,5 +113,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Fri, 02 Jul 2021 13:22:38 GMT" } + }, + "10.0.22": { + "hash": "/ipfs/QmSzcx9CzDuZ5fjfM9edee3tYdcqTTqN2ghVzAQRMoXGE7", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 14 Jul 2021 13:22:33 GMT" + } } } \ No newline at end of file From b30873ea121f03d450cb81f06da1b08341bc71e3 Mon Sep 17 00:00:00 2001 From: 0xK4d1r Date: Fri, 16 Jul 2021 16:22:46 +0300 Subject: [PATCH 24/95] add release workflow --- .github/workflows/release.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a8dc920 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,12 @@ +name: Release +on: + push: + branches: + - master +jobs: + release: + runs-on: ubuntu-18.04 + steps: + - uses: AvadoDServer/ci-release-action@main + with: + rpcToken: ${{ secrets.RPC_TOKEN }} From 31186d67807ce21b0f3c5264f889fb78bdbf4bca Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 22 Jul 2021 20:04:35 +0200 Subject: [PATCH 25/95] Update 10.0.23: geth v1.10.6 --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 2bdf9f2..b2d3e1d 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.5 as geth +FROM ethereum/client-go:v1.10.6 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index cd209f8..58791fe 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.22", - "upstream": "v1.10.5", + "version": "10.0.23", + "upstream": "v1.10.6", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.22.tar.xz", - "hash": "/ipfs/QmX1LSGGNpaScsLqHp3ASvzcCUd2CAVvJrw9cEcNCN8Ddc", - "size": 29694608, + "path": "ethchain-geth.public.dappnode.eth_10.0.23.tar.xz", + "hash": "/ipfs/QmSwqUCDmJLmre13G2riaeW4rGju8ViWuigQKb2kGCDv5L", + "size": 29790712, "restart": "always", "ports": [ "443:443", diff --git a/docker-compose.yml b/docker-compose.yml index 43415a0..7668b6c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.22' + image: 'ethchain-geth.public.dappnode.eth:10.0.23' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 76c7a21..4b7929d 100644 --- a/releases.json +++ b/releases.json @@ -120,5 +120,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 14 Jul 2021 13:22:33 GMT" } + }, + "10.0.23": { + "hash": "/ipfs/QmavVWt2rcXY8Vp2em9Y5V7NDh2aJB7GrEnCM1f1cMDfm1", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Thu, 22 Jul 2021 18:04:35 GMT" + } } } \ No newline at end of file From 4a994c53eaf2325ba6af51b73fd35b6b4ea68f6a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 22 Jul 2021 23:34:53 +0000 Subject: [PATCH 26/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 58791fe..770cc2f 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.23.tar.xz", - "hash": "/ipfs/QmSwqUCDmJLmre13G2riaeW4rGju8ViWuigQKb2kGCDv5L", - "size": 29790712, + "hash": "/ipfs/QmS4xPzcQ8XJmCvQD8RQwwjB6mrgoJLcY2rvMhtFejLVom", + "size": 30357180, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-07-02T13:22:38.023Z" + "builddate": "2021-07-22T18:10:04.548Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 4b7929d..89b274b 100644 --- a/releases.json +++ b/releases.json @@ -122,10 +122,10 @@ } }, "10.0.23": { - "hash": "/ipfs/QmavVWt2rcXY8Vp2em9Y5V7NDh2aJB7GrEnCM1f1cMDfm1", + "hash": "/ipfs/QmYsj2KPPTUBVUxraKrrGQgww5fiqZoikTW1ga2yvdCYTG", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 22 Jul 2021 18:04:35 GMT" + "http://80.208.229.228:5001": "Thu, 22 Jul 2021 18:10:04 GMT" } } } \ No newline at end of file From aa82666cfd06a49428fae979b394d57d0a9ad044 Mon Sep 17 00:00:00 2001 From: stefaan Date: Fri, 23 Jul 2021 01:57:35 +0200 Subject: [PATCH 27/95] added workflows --- .github/workflows/release.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a8dc920 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,12 @@ +name: Release +on: + push: + branches: + - master +jobs: + release: + runs-on: ubuntu-18.04 + steps: + - uses: AvadoDServer/ci-release-action@main + with: + rpcToken: ${{ secrets.RPC_TOKEN }} From 5fdfc39017fde9e98348833a701ff9fbd579ec7d Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 12 Aug 2021 14:31:41 +0200 Subject: [PATCH 28/95] Update 10.0.24: geth v1.10.7 --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index b2d3e1d..621a86b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.6 as geth +FROM ethereum/client-go:v1.10.7 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 770cc2f..c4474f2 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.23", - "upstream": "v1.10.6", + "version": "10.0.24", + "upstream": "v1.10.7", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.23.tar.xz", - "hash": "/ipfs/QmS4xPzcQ8XJmCvQD8RQwwjB6mrgoJLcY2rvMhtFejLVom", - "size": 30357180, + "path": "ethchain-geth.public.dappnode.eth_10.0.24.tar.xz", + "hash": "/ipfs/QmWVo15EtLfx8hHz8qk6PYxCs91dSsaEjXP2KTvUZ7GQF9", + "size": 29733780, "restart": "always", "ports": [ "443:443", diff --git a/docker-compose.yml b/docker-compose.yml index 7668b6c..634c93b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.23' + image: 'ethchain-geth.public.dappnode.eth:10.0.24' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 89b274b..2ec7f6e 100644 --- a/releases.json +++ b/releases.json @@ -127,5 +127,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Thu, 22 Jul 2021 18:10:04 GMT" } + }, + "10.0.24": { + "hash": "/ipfs/QmdXM95ohgjyuMEZAMASxKBdhXKSrPorj8p4YW2jbbCBeX", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Thu, 12 Aug 2021 12:31:41 GMT" + } } } \ No newline at end of file From aec0a3ce1eb925a7ac49ba6e9f632c9f00b3d079 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 24 Aug 2021 09:31:28 +0200 Subject: [PATCH 29/95] Update 10.0.25: geth v1.10.8 --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 621a86b..7d0b9c3 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.7 as geth +FROM ethereum/client-go:v1.10.8 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index c4474f2..4e0b4a6 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.24", - "upstream": "v1.10.7", + "version": "10.0.25", + "upstream": "v1.10.8", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.24.tar.xz", - "hash": "/ipfs/QmWVo15EtLfx8hHz8qk6PYxCs91dSsaEjXP2KTvUZ7GQF9", - "size": 29733780, + "path": "ethchain-geth.public.dappnode.eth_10.0.25.tar.xz", + "hash": "/ipfs/QmQNcQmwcRRaz5xffghxfMJJ9fXWw3SK8xxbH9j61otJo9", + "size": 30746484, "restart": "always", "ports": [ "443:443", diff --git a/docker-compose.yml b/docker-compose.yml index 634c93b..fd9ca09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.24' + image: 'ethchain-geth.public.dappnode.eth:10.0.25' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 2ec7f6e..38c25c6 100644 --- a/releases.json +++ b/releases.json @@ -134,5 +134,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Thu, 12 Aug 2021 12:31:41 GMT" } + }, + "10.0.25": { + "hash": "/ipfs/QmW43jbyqMHnAzZStck4WBR7zC1qYErdETjDHsrXN4ddyn", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Tue, 24 Aug 2021 07:31:28 GMT" + } } } \ No newline at end of file From 7db5c792152194efbb01da181cfdaa366f4432fc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 25 Aug 2021 12:30:46 +0000 Subject: [PATCH 30/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 4e0b4a6..fae994f 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.25.tar.xz", - "hash": "/ipfs/QmQNcQmwcRRaz5xffghxfMJJ9fXWw3SK8xxbH9j61otJo9", - "size": 30746484, + "hash": "/ipfs/QmYDgrvjv4Q2KQFp1GGErjQ5FmLsqjcpA4PdxmvnWafpUZ", + "size": 31396692, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-07-22T18:10:04.548Z" + "builddate": "2021-08-24T07:34:31.069Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 1d881da..ebf3934 100644 --- a/releases.json +++ b/releases.json @@ -136,10 +136,10 @@ } }, "10.0.25": { - "hash": "/ipfs/QmW43jbyqMHnAzZStck4WBR7zC1qYErdETjDHsrXN4ddyn", + "hash": "/ipfs/QmYWAoPfEcma7R8TWBFghckp7KM5phb4LYX6UjhzxGJHZs", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 24 Aug 2021 07:31:28 GMT" + "http://80.208.229.228:5001": "Tue, 24 Aug 2021 07:34:31 GMT" } } } \ No newline at end of file From b06f56ad28e9e9e30e493b1f178a970b048b1637 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 29 Sep 2021 22:31:59 +0200 Subject: [PATCH 31/95] Update 10.0.26: geth v1.10.9 --- build/Dockerfile | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 7d0b9c3..280ca32 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.8 as geth +FROM ethereum/client-go:v1.10.9 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index fae994f..13db414 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.25", - "upstream": "v1.10.8", + "version": "10.0.26", + "upstream": "v1.10.9", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.25.tar.xz", - "hash": "/ipfs/QmYDgrvjv4Q2KQFp1GGErjQ5FmLsqjcpA4PdxmvnWafpUZ", - "size": 31396692, + "path": "ethchain-geth.public.dappnode.eth_10.0.26.tar.xz", + "hash": "/ipfs/QmfE5SjTpULH3WCK53z8xBjS25irCsKgKmraxEvJoCx6h2", + "size": 31078300, "restart": "always", "ports": [ "443:443", diff --git a/docker-compose.yml b/docker-compose.yml index fd9ca09..3badc05 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.25' + image: 'ethchain-geth.public.dappnode.eth:10.0.26' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index ebf3934..a362d91 100644 --- a/releases.json +++ b/releases.json @@ -141,5 +141,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Tue, 24 Aug 2021 07:34:31 GMT" } + }, + "10.0.26": { + "hash": "/ipfs/QmPbqC4mrCySbNQsWLJkfVHm2dLZW7L6m3vLPke2oWTubU", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 29 Sep 2021 20:31:59 GMT" + } } } \ No newline at end of file From 5eef51cb1ebbb6427e591dd0e9d35921f6277238 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 Sep 2021 20:57:52 +0000 Subject: [PATCH 32/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 13db414..127cc28 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.26.tar.xz", - "hash": "/ipfs/QmfE5SjTpULH3WCK53z8xBjS25irCsKgKmraxEvJoCx6h2", - "size": 31078300, + "hash": "/ipfs/QmQnPyYaTMqUhLpqsuL3zovjHzrn5LssFBvNf75vVG5m4y", + "size": 31839436, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-08-24T07:34:31.069Z" + "builddate": "2021-09-29T20:36:57.573Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index a362d91..acb7b66 100644 --- a/releases.json +++ b/releases.json @@ -143,10 +143,10 @@ } }, "10.0.26": { - "hash": "/ipfs/QmPbqC4mrCySbNQsWLJkfVHm2dLZW7L6m3vLPke2oWTubU", + "hash": "/ipfs/QmS5YcjC8ag6KTHDANhSo3FCnNXqY2UYNFkLvwzJ5w5g1q", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 29 Sep 2021 20:31:59 GMT" + "http://80.208.229.228:5001": "Wed, 29 Sep 2021 20:36:58 GMT" } } } \ No newline at end of file From 1af90aaf6e805667d9785d5a9dbdb952bd127ac2 Mon Sep 17 00:00:00 2001 From: stefaan Date: Wed, 6 Oct 2021 17:40:25 +0200 Subject: [PATCH 33/95] parse out and correct EXTRA_OPTS on old installs --- build/Dockerfile | 9 +++++++-- build/files/start.sh | 11 +++++++++++ build/files/supervisord.conf | 2 +- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- 5 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 build/files/start.sh diff --git a/build/Dockerfile b/build/Dockerfile index 280ca32..3bef749 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.9 as geth +FROM ethereum/client-go:v1.10.6 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl @@ -28,4 +28,9 @@ COPY files/nginx.conf /etc/nginx RUN mkdir -p /run/nginx COPY ./files/supervisord.conf /etc/supervisord.conf -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] + +# Startup script +COPY ./files/start.sh /opt/start.sh +RUN chmod +x /opt/start.sh + +ENTRYPOINT ["/opt/start.sh"] \ No newline at end of file diff --git a/build/files/start.sh b/build/files/start.sh new file mode 100644 index 0000000..92682b0 --- /dev/null +++ b/build/files/start.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +# Older installations use the deprecated option "--rpcapi" so replace it by "--http.api" +export EXTRA_OPTS_PARSED=`echo -n $EXTRA_OPTS | sed s/--rpcapi/--http\.api/g` +export GETH_CMD="/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 --cache 4096 $EXTRA_OPTS_PARSED" + +echo "EXTRA_OPTS=$EXTRA_OPTS" +echo "EXTRA_OPTS_PARSED=$EXTRA_OPTS_PARSED" +echo "GETH_CMD=$GETH_CMD" + +/usr/bin/supervisord -c /etc/supervisord.conf diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index dc7a872..92cc407 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -3,7 +3,7 @@ nodaemon=true user=root [program:geth] -command=/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 --cache 4096 %(ENV_EXTRA_OPTS)s +command=%(ENV_GETH_CMD)s autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 diff --git a/dappnode_package.json b/dappnode_package.json index 127cc28..a053449 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.26", + "version": "10.0.27", "upstream": "v1.10.9", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.26.tar.xz", - "hash": "/ipfs/QmQnPyYaTMqUhLpqsuL3zovjHzrn5LssFBvNf75vVG5m4y", - "size": 31839436, + "path": "", + "hash": "", + "size": "", "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-09-29T20:36:57.573Z" + "builddate": "2021-10-06T15:38:51.655Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3badc05..6c9b6b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.26' + image: 'ethchain-geth.public.dappnode.eth:10.0.27' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From f5107b131dea8788ff3090c667bb68acd1f47308 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 12 Oct 2021 21:23:28 +0000 Subject: [PATCH 34/95] apply build diff --- dappnode_package.json | 8 ++++---- releases.json | 7 +++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index a053449..485ce2c 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "", - "hash": "", - "size": "", + "path": "ethchain-geth.public.dappnode.eth_10.0.27.tar.xz", + "hash": "/ipfs/QmPPuZnLVe943bZxtq8GStBYHvD5pCaGqQqS5iLTS8T8sx", + "size": 30462956, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-10-06T15:38:51.655Z" + "builddate": "2021-10-06T15:47:08.057Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index acb7b66..7de5ce8 100644 --- a/releases.json +++ b/releases.json @@ -148,5 +148,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 29 Sep 2021 20:36:58 GMT" } + }, + "10.0.27": { + "hash": "/ipfs/QmNfZD4LekbUqoGpg3ZxtQmH5uga7TVArDjAP1cYZan72P", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 06 Oct 2021 15:47:08 GMT" + } } } \ No newline at end of file From facfa7a554a9b6153e4e4bf56c552627985b40fb Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 20 Oct 2021 13:33:19 +0000 Subject: [PATCH 35/95] Update 10.0.28: geth v1.10.10 --- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 485ce2c..1567a17 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.27", - "upstream": "v1.10.9", + "version": "10.0.28", + "upstream": "v1.10.10", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.27.tar.xz", - "hash": "/ipfs/QmPPuZnLVe943bZxtq8GStBYHvD5pCaGqQqS5iLTS8T8sx", - "size": 30462956, + "path": "ethchain-geth.public.dappnode.eth_10.0.28.tar.xz", + "hash": "/ipfs/QmV2KJm88S23eB2Pp4EYUuD1WVZHKuvw2feDttjQeMmvkq", + "size": 30395348, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-10-06T15:47:08.057Z" + "builddate": "2021-10-20T13:33:19.114Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6c9b6b3..d72fa91 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.27' + image: 'ethchain-geth.public.dappnode.eth:10.0.28' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 7de5ce8..cd730de 100644 --- a/releases.json +++ b/releases.json @@ -155,5 +155,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 06 Oct 2021 15:47:08 GMT" } + }, + "10.0.28": { + "hash": "/ipfs/QmRF7napDMrxnR7dyph31T2RtqupkXSoGXjpMYBJxUwNNq", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:33:19 GMT" + } } } \ No newline at end of file From 7923e0db698434e4622c3c37c78f482da6aef842 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 20 Oct 2021 13:44:40 +0000 Subject: [PATCH 36/95] Update 10.0.29: geth v1.10.11 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.11 Manifest hash: /ipfs/QmfTR86SLd77QA3DnyhkQka6zeDXB1upwKzeySXBEiJ8GT --- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 1567a17..d6aed3c 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.28", - "upstream": "v1.10.10", + "version": "10.0.29", + "upstream": "v1.10.11", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,8 +9,8 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.28.tar.xz", - "hash": "/ipfs/QmV2KJm88S23eB2Pp4EYUuD1WVZHKuvw2feDttjQeMmvkq", + "path": "ethchain-geth.public.dappnode.eth_10.0.29.tar.xz", + "hash": "/ipfs/QmddsDpnhjEnd8SzxctAfUBgTQBYYo1gH8MYtV2ghj6W3U", "size": 30395348, "restart": "always", "ports": [ @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-10-20T13:33:19.114Z" + "builddate": "2021-10-20T13:44:40.475Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d72fa91..9bce865 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.28' + image: 'ethchain-geth.public.dappnode.eth:10.0.29' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index cd730de..43796d1 100644 --- a/releases.json +++ b/releases.json @@ -162,5 +162,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:33:19 GMT" } + }, + "10.0.29": { + "hash": "/ipfs/QmfTR86SLd77QA3DnyhkQka6zeDXB1upwKzeySXBEiJ8GT", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:44:40 GMT" + } } } \ No newline at end of file From da6c61514f3f4592d0d63e1eeda6807794283772 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 21 Oct 2021 14:29:41 +0000 Subject: [PATCH 37/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index d6aed3c..d57257e 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.29.tar.xz", - "hash": "/ipfs/QmddsDpnhjEnd8SzxctAfUBgTQBYYo1gH8MYtV2ghj6W3U", - "size": 30395348, + "hash": "/ipfs/QmekrTiXzchTa8Udjz81Zii4qmv5LRJK1ovjsnzFjPBgTV", + "size": 30397904, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-10-20T13:44:40.475Z" + "builddate": "2021-10-20T13:52:18.448Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 43796d1..0d3b269 100644 --- a/releases.json +++ b/releases.json @@ -164,10 +164,10 @@ } }, "10.0.29": { - "hash": "/ipfs/QmfTR86SLd77QA3DnyhkQka6zeDXB1upwKzeySXBEiJ8GT", + "hash": "/ipfs/QmVrUSzH3DZzKEnkhmj1QYaDYUYCZ5rb4WUr7yFdk7aCVE", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:44:40 GMT" + "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:52:18 GMT" } } } \ No newline at end of file From 707f93633cdcdb6b0ab2c1f42c15b4a4e1a62f30 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 8 Nov 2021 16:22:37 +0000 Subject: [PATCH 38/95] Update 10.0.30: geth v1.10.12 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.12 Manifest hash: /ipfs/QmXWdij6P1yGxjYU2qDwSsT8E85SjhGSak5js8b7imPYuX --- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index d57257e..aa7eb23 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.29", - "upstream": "v1.10.11", + "version": "10.0.30", + "upstream": "v1.10.12", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.29.tar.xz", - "hash": "/ipfs/QmekrTiXzchTa8Udjz81Zii4qmv5LRJK1ovjsnzFjPBgTV", - "size": 30397904, + "path": "ethchain-geth.public.dappnode.eth_10.0.30.tar.xz", + "hash": "/ipfs/QmT5qVrdnch95jBK2tV8QkvhVjiwcjCU63zt6awve4oGV4", + "size": 30359844, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-10-20T13:52:18.448Z" + "builddate": "2021-11-08T16:22:37.769Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9bce865..60cba0b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.29' + image: 'ethchain-geth.public.dappnode.eth:10.0.30' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 0d3b269..3e2715d 100644 --- a/releases.json +++ b/releases.json @@ -169,5 +169,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:52:18 GMT" } + }, + "10.0.30": { + "hash": "/ipfs/QmXWdij6P1yGxjYU2qDwSsT8E85SjhGSak5js8b7imPYuX", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Mon, 08 Nov 2021 16:22:37 GMT" + } } } \ No newline at end of file From 32ac7e0447ecd7170fe0a253081cca25414175a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 9 Nov 2021 13:23:17 +0000 Subject: [PATCH 39/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index aa7eb23..a7327d1 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.30.tar.xz", - "hash": "/ipfs/QmT5qVrdnch95jBK2tV8QkvhVjiwcjCU63zt6awve4oGV4", - "size": 30359844, + "hash": "/ipfs/QmRyYc3cs7j18J2bmiPEjuMKA8GE8Sq4wBW9nviCdRx2MT", + "size": 30465564, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-11-08T16:22:37.769Z" + "builddate": "2021-11-08T16:27:57.819Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 3e2715d..28b87ac 100644 --- a/releases.json +++ b/releases.json @@ -171,10 +171,10 @@ } }, "10.0.30": { - "hash": "/ipfs/QmXWdij6P1yGxjYU2qDwSsT8E85SjhGSak5js8b7imPYuX", + "hash": "/ipfs/QmYiY51SdENUfHZtdjfP9SH6MC8NZwHqiGM9whdYz26ncC", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Mon, 08 Nov 2021 16:22:37 GMT" + "http://80.208.229.228:5001": "Mon, 08 Nov 2021 16:27:58 GMT" } } } \ No newline at end of file From d94ac4d5600ba49caa941d0475471b7e0137436b Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 22 Nov 2021 11:48:01 +0100 Subject: [PATCH 40/95] Fixed version number + print version at startup --- build/Dockerfile | 2 +- build/files/start.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3bef749..bd90966 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.6 as geth +FROM ethereum/client-go:v1.10.12 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/build/files/start.sh b/build/files/start.sh index 92682b0..6cc0810 100644 --- a/build/files/start.sh +++ b/build/files/start.sh @@ -8,4 +8,8 @@ echo "EXTRA_OPTS=$EXTRA_OPTS" echo "EXTRA_OPTS_PARSED=$EXTRA_OPTS_PARSED" echo "GETH_CMD=$GETH_CMD" +# Print version to the log +/usr/local/bin/geth version + +# Start supervisor /usr/bin/supervisord -c /etc/supervisord.conf From a7c32c6837ca0e627298da987e6276a42d09e784 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 22 Nov 2021 11:49:51 +0100 Subject: [PATCH 41/95] Update 10.0.31: geth v1.10.12 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.12 Manifest hash: /ipfs/QmZec88cu1CPcDC3Fu3NBapDcRkmn81SUZ5jUgAke4q1Es --- dappnode_package.json | 10 +++++----- docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index a7327d1..9c56c22 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.30", + "version": "10.0.31", "upstream": "v1.10.12", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.30.tar.xz", - "hash": "/ipfs/QmRyYc3cs7j18J2bmiPEjuMKA8GE8Sq4wBW9nviCdRx2MT", - "size": 30465564, + "path": "ethchain-geth.public.dappnode.eth_10.0.31.tar.xz", + "hash": "/ipfs/QmUv5sMJbQZHdXfxDkDaKAFzuTso98XF79o97kK4DzUYdE", + "size": 32585952, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-11-08T16:27:57.819Z" + "builddate": "2021-11-22T10:49:51.638Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 60cba0b..dbe8b08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.30' + image: 'ethchain-geth.public.dappnode.eth:10.0.31' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 28b87ac..4c96e43 100644 --- a/releases.json +++ b/releases.json @@ -176,5 +176,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Mon, 08 Nov 2021 16:27:58 GMT" } + }, + "10.0.31": { + "hash": "/ipfs/QmZec88cu1CPcDC3Fu3NBapDcRkmn81SUZ5jUgAke4q1Es", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Mon, 22 Nov 2021 10:49:51 GMT" + } } } \ No newline at end of file From 1deb32de7440e93dd376c222c3a004ac8d2b77ef Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 23 Nov 2021 17:22:57 +0000 Subject: [PATCH 42/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 9c56c22..3fe292b 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.31.tar.xz", - "hash": "/ipfs/QmUv5sMJbQZHdXfxDkDaKAFzuTso98XF79o97kK4DzUYdE", - "size": 32585952, + "hash": "/ipfs/QmQkDK1fqRyEgtRBhbyWN9TcXmdeSV4o9Nn8MpwYYCUczA", + "size": 32626416, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-11-22T10:49:51.638Z" + "builddate": "2021-11-22T10:54:59.878Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 4c96e43..6455686 100644 --- a/releases.json +++ b/releases.json @@ -178,10 +178,10 @@ } }, "10.0.31": { - "hash": "/ipfs/QmZec88cu1CPcDC3Fu3NBapDcRkmn81SUZ5jUgAke4q1Es", + "hash": "/ipfs/QmNzgErAb2nciUEH9eu8g8d2N9BrrSQQV3HYwQ8wASQZ5m", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Mon, 22 Nov 2021 10:49:51 GMT" + "http://80.208.229.228:5001": "Mon, 22 Nov 2021 10:55:00 GMT" } } } \ No newline at end of file From b917eb63a6ff1c5cbb3945ff6d28bab5b405ee17 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 24 Nov 2021 14:14:33 +0100 Subject: [PATCH 43/95] Update 10.0.32: geth v1.10.13 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.13 Manifest hash: /ipfs/QmXpi2T3YsHqhJBVWHRtGiky7CNRc8AhzxcHkqKiFMgFpm --- build/Dockerfile | 2 +- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index bd90966..3de967b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.12 as geth +FROM ethereum/client-go:v1.10.13 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 3fe292b..3049569 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.31", - "upstream": "v1.10.12", + "version": "10.0.32", + "upstream": "v1.10.13", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.31.tar.xz", - "hash": "/ipfs/QmQkDK1fqRyEgtRBhbyWN9TcXmdeSV4o9Nn8MpwYYCUczA", - "size": 32626416, + "path": "ethchain-geth.public.dappnode.eth_10.0.32.tar.xz", + "hash": "/ipfs/QmWAFAGZqr3xoxtkv8RamnUv746s4kJZfmpBRPy38AhTeY", + "size": 32599656, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-11-22T10:54:59.878Z" + "builddate": "2021-11-24T13:14:33.285Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index dbe8b08..bc63f53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.31' + image: 'ethchain-geth.public.dappnode.eth:10.0.32' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 6455686..29a4c89 100644 --- a/releases.json +++ b/releases.json @@ -183,5 +183,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Mon, 22 Nov 2021 10:55:00 GMT" } + }, + "10.0.32": { + "hash": "/ipfs/QmXpi2T3YsHqhJBVWHRtGiky7CNRc8AhzxcHkqKiFMgFpm", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 24 Nov 2021 13:14:33 GMT" + } } } \ No newline at end of file From 6cbeb47aa08a12e3053105e898568283d628e2a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 4 Dec 2021 09:59:28 +0000 Subject: [PATCH 44/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 3049569..b90aef6 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.32.tar.xz", - "hash": "/ipfs/QmWAFAGZqr3xoxtkv8RamnUv746s4kJZfmpBRPy38AhTeY", - "size": 32599656, + "hash": "/ipfs/QmepHdyssmnbMbYSCPNWuj9rZeKPGNpqEFo8XFeuGi3RDm", + "size": 32503156, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-11-24T13:14:33.285Z" + "builddate": "2021-11-24T13:22:16.962Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 29a4c89..231b4c3 100644 --- a/releases.json +++ b/releases.json @@ -185,10 +185,10 @@ } }, "10.0.32": { - "hash": "/ipfs/QmXpi2T3YsHqhJBVWHRtGiky7CNRc8AhzxcHkqKiFMgFpm", + "hash": "/ipfs/QmaCbc6Q1JLnrDnQR1MFeCM2GiK7Ey83CimTRN3uhsqe99", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 24 Nov 2021 13:14:33 GMT" + "http://80.208.229.228:5001": "Wed, 24 Nov 2021 13:22:17 GMT" } } } \ No newline at end of file From d2911d74ba654887eb84311de85e0035bccb1703 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 23 Dec 2021 12:07:11 +0100 Subject: [PATCH 45/95] Update 10.0.33: geth v1.10.14 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.14 Manifest hash: /ipfs/QmbRpaHCcE5ydCvrtC3aFm1ZSNddSqrxCadSkAJGye4zBN --- build/Dockerfile | 2 +- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3de967b..3ef6c02 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.13 as geth +FROM ethereum/client-go:v1.10.14 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index b90aef6..fd6ea50 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.32", - "upstream": "v1.10.13", + "version": "10.0.33", + "upstream": "v1.10.14", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.32.tar.xz", - "hash": "/ipfs/QmepHdyssmnbMbYSCPNWuj9rZeKPGNpqEFo8XFeuGi3RDm", - "size": 32503156, + "path": "ethchain-geth.public.dappnode.eth_10.0.33.tar.xz", + "hash": "/ipfs/QmPQVZEShDxFLWyLPvAV3zSmzPE1dXWK8kXo91r6pTtfKA", + "size": 32562124, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-11-24T13:22:16.962Z" + "builddate": "2021-12-23T11:07:11.648Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bc63f53..05d1ba6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.32' + image: 'ethchain-geth.public.dappnode.eth:10.0.33' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 231b4c3..c66aa8f 100644 --- a/releases.json +++ b/releases.json @@ -190,5 +190,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 24 Nov 2021 13:22:17 GMT" } + }, + "10.0.33": { + "hash": "/ipfs/QmbRpaHCcE5ydCvrtC3aFm1ZSNddSqrxCadSkAJGye4zBN", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Thu, 23 Dec 2021 11:07:11 GMT" + } } } \ No newline at end of file From e69a701b707fba3d99496588883e41603c0ca984 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 Dec 2021 10:49:12 +0000 Subject: [PATCH 46/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index fd6ea50..ac66454 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.33.tar.xz", - "hash": "/ipfs/QmPQVZEShDxFLWyLPvAV3zSmzPE1dXWK8kXo91r6pTtfKA", - "size": 32562124, + "hash": "/ipfs/QmZ9iRDNEfnXB3pFyo4VkypWt42Ra1ZcxxRG2BvDZDa6JM", + "size": 32856280, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-12-23T11:07:11.648Z" + "builddate": "2021-12-23T11:11:45.232Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index c66aa8f..3a62b38 100644 --- a/releases.json +++ b/releases.json @@ -192,10 +192,10 @@ } }, "10.0.33": { - "hash": "/ipfs/QmbRpaHCcE5ydCvrtC3aFm1ZSNddSqrxCadSkAJGye4zBN", + "hash": "/ipfs/Qmd1mzh9GrUBvBE5y69urdbQi4rkiHTJJYr4RorMrSku6c", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 23 Dec 2021 11:07:11 GMT" + "http://80.208.229.228:5001": "Thu, 23 Dec 2021 11:11:45 GMT" } } } \ No newline at end of file From 7183534d7b4f0ceab510b884907051f4f649cbfb Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 7 Jan 2022 09:06:20 +0100 Subject: [PATCH 47/95] Update 10.0.34: geth v1.10.15 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.15 Manifest hash: /ipfs/QmbgDRzJRA2mzrVXRQTcBJRu1VDTx7iJadADz9X78fPaUa --- build/Dockerfile | 2 +- dappnode_package.json | 12 ++++++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3ef6c02..ffa3057 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.14 as geth +FROM ethereum/client-go:v1.10.15 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index ac66454..167e31c 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.33", - "upstream": "v1.10.14", + "version": "10.0.34", + "upstream": "v1.10.15", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -9,9 +9,9 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.33.tar.xz", - "hash": "/ipfs/QmZ9iRDNEfnXB3pFyo4VkypWt42Ra1ZcxxRG2BvDZDa6JM", - "size": 32856280, + "path": "ethchain-geth.public.dappnode.eth_10.0.34.tar.xz", + "hash": "/ipfs/QmWxQT2s9aeBGFSeWwRBTjZyh3soAu2p3UqgqoFWNHJ6Wn", + "size": 32635124, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2021-12-23T11:11:45.232Z" + "builddate": "2022-01-07T08:06:20.138Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 05d1ba6..23dc555 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.33' + image: 'ethchain-geth.public.dappnode.eth:10.0.34' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 3a62b38..2da47e4 100644 --- a/releases.json +++ b/releases.json @@ -197,5 +197,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Thu, 23 Dec 2021 11:11:45 GMT" } + }, + "10.0.34": { + "hash": "/ipfs/QmbgDRzJRA2mzrVXRQTcBJRu1VDTx7iJadADz9X78fPaUa", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Fri, 07 Jan 2022 08:06:20 GMT" + } } } \ No newline at end of file From af9d3a665769fc9e6cda35a3ed0c876b26f416ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 7 Jan 2022 20:56:11 +0000 Subject: [PATCH 48/95] apply build diff --- dappnode_package.json | 6 +++--- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 167e31c..c106673 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -10,8 +10,8 @@ "chain": "ethereum", "image": { "path": "ethchain-geth.public.dappnode.eth_10.0.34.tar.xz", - "hash": "/ipfs/QmWxQT2s9aeBGFSeWwRBTjZyh3soAu2p3UqgqoFWNHJ6Wn", - "size": 32635124, + "hash": "/ipfs/QmRakr2nc4gvoX8eiteTcMUjgAeWcDzk4ApseNXXjcqsAv", + "size": 32804536, "restart": "always", "ports": [ "443:443", @@ -31,5 +31,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2022-01-07T08:06:20.138Z" + "builddate": "2022-01-07T08:10:48.688Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 2da47e4..1d108c7 100644 --- a/releases.json +++ b/releases.json @@ -199,10 +199,10 @@ } }, "10.0.34": { - "hash": "/ipfs/QmbgDRzJRA2mzrVXRQTcBJRu1VDTx7iJadADz9X78fPaUa", + "hash": "/ipfs/QmeHJXf24Wpvuhjw9xkwAE9oyRjgxJf1JS8Uu8EYbo3P53", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 07 Jan 2022 08:06:20 GMT" + "http://80.208.229.228:5001": "Fri, 07 Jan 2022 08:10:49 GMT" } } } \ No newline at end of file From fac128d487030a76aa5f996a10fad0a7658d1a44 Mon Sep 17 00:00:00 2001 From: stefaan Date: Mon, 24 Jan 2022 11:27:45 +0100 Subject: [PATCH 49/95] change certs --- build/Dockerfile | 8 ++++---- build/files/nginx.conf | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 3bef749..15b7d9f 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl WORKDIR /cert ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache -RUN wget http://iso.ava.do/server.crt -RUN wget http://iso.ava.do/server.key +RUN wget http://iso.ava.do/my.ava.do.crt +RUN wget http://iso.ava.do/my.ava.do.key FROM alpine:latest @@ -20,8 +20,8 @@ RUN rm -rf /var/cache/apk/* # Set up nginx config RUN mkdir -p /etc/nginx/certs/ -COPY --from=build-deps-wizard /cert/server.crt /etc/nginx/certs/server.crt -COPY --from=build-deps-wizard /cert/server.key /etc/nginx/certs/server.key +COPY --from=build-deps-wizard /cert/my.ava.do.crt /etc/nginx/certs/my.ava.do.crt +COPY --from=build-deps-wizard /cert/my.ava.do.key /etc/nginx/certs/my.ava.do.key RUN ls -l /etc/nginx/certs/ COPY files/nginx.conf /etc/nginx diff --git a/build/files/nginx.conf b/build/files/nginx.conf index 4327a39..8b9b088 100644 --- a/build/files/nginx.conf +++ b/build/files/nginx.conf @@ -23,10 +23,10 @@ http { server { listen 443 ssl; - server_name ethchain-geth.avadopackage.com; + server_name ethchain-geth.my.ava.do; - ssl_certificate /etc/nginx/certs/server.crt; - ssl_certificate_key /etc/nginx/certs/server.key; + ssl_certificate /etc/nginx/certs/my.ava.do.crt; + ssl_certificate_key /etc/nginx/certs/my.ava.do.key; location / { if ($request_method = 'OPTIONS') { From 5924aa7d87b8bacb7f299102b7b27b0b7fa774d8 Mon Sep 17 00:00:00 2001 From: stefaan Date: Mon, 24 Jan 2022 12:21:57 +0100 Subject: [PATCH 50/95] new certificates --- dappnode_package.json | 8 ++------ docker-compose.yml | 2 +- releases.json | 7 +++++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index c106673..adad47f 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.34", + "version": "10.0.35", "upstream": "v1.10.15", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -9,12 +9,8 @@ "type": "library", "chain": "ethereum", "image": { - "path": "ethchain-geth.public.dappnode.eth_10.0.34.tar.xz", - "hash": "/ipfs/QmRakr2nc4gvoX8eiteTcMUjgAeWcDzk4ApseNXXjcqsAv", - "size": 32804536, "restart": "always", "ports": [ - "443:443", "30303:30303", "30303:30303/udp" ], @@ -31,5 +27,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2022-01-07T08:10:48.688Z" + "builddate": "2022-01-24T10:31:49.575Z" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 23dc555..3c22d8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.34' + image: 'ethchain-geth.public.dappnode.eth:10.0.35' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 1d108c7..81be7d2 100644 --- a/releases.json +++ b/releases.json @@ -204,5 +204,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Fri, 07 Jan 2022 08:10:49 GMT" } + }, + "10.0.35": { + "hash": "/ipfs/QmYXjQjN6Yci5bpJA4TU5qvDQe211wpozFa1PuAb35hGhS", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Mon, 24 Jan 2022 10:31:49 GMT" + } } } \ No newline at end of file From 280cd3f552224b6c4f8c02d358c03dcef15214d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 24 Jan 2022 12:30:48 +0000 Subject: [PATCH 51/95] apply build diff --- dappnode_package.json | 5 +++-- releases.json | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index adad47f..e50a14b 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -19,7 +19,8 @@ ], "environment": [ "EXTRA_OPTS=--http.api eth,net,web3,txpool" - ] + ], + "size": 32799060 }, "author": "AVADO", "license": "(C)", @@ -27,5 +28,5 @@ "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" }, - "builddate": "2022-01-24T10:31:49.575Z" + "builddate": "2022-01-24T11:25:09.753Z" } \ No newline at end of file diff --git a/releases.json b/releases.json index 81be7d2..aa615e3 100644 --- a/releases.json +++ b/releases.json @@ -206,10 +206,10 @@ } }, "10.0.35": { - "hash": "/ipfs/QmYXjQjN6Yci5bpJA4TU5qvDQe211wpozFa1PuAb35hGhS", + "hash": "/ipfs/QmRjKywzkoq1GxgZsCNh1EuUy7zFPaGh3Lx2FXWNcooHDW", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Mon, 24 Jan 2022 10:31:49 GMT" + "http://80.208.229.228:5001": "Mon, 24 Jan 2022 11:25:09 GMT" } } } \ No newline at end of file From 1216892fc7986c3877cfa4dc3632273a0611331e Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 18 Jan 2022 13:35:43 +0100 Subject: [PATCH 52/95] Use improved supervisord file --- build/files/nginx.conf | 2 -- build/files/supervisord.conf | 17 +++++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build/files/nginx.conf b/build/files/nginx.conf index 8b9b088..5f0d97a 100644 --- a/build/files/nginx.conf +++ b/build/files/nginx.conf @@ -4,8 +4,6 @@ events { worker_connections 1024; } -daemon off; - http { include mime.types; default_type application/octet-stream; diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index 92cc407..2500831 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -1,7 +1,19 @@ +[unix_http_server] +file=/dev/shm/supervisor.sock +chmod=0700 + [supervisord] nodaemon=true user=root +[supervisorctl] + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///dev/shm/supervisor.sock + [program:geth] command=%(ENV_GETH_CMD)s autostart=true @@ -9,11 +21,12 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -stopsignal=INT +killasgroup=true +stopasgroup=true [program:nginx] -command=nginx -c /etc/nginx/nginx.conf +command=nginx -c /etc/nginx/nginx.conf -g "daemon off;" autostart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 From d06bf2808db778fdfbdeec06b4c73e65242b6a9a Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 15 Feb 2022 16:24:24 +0100 Subject: [PATCH 53/95] Update 10.0.36: geth v1.10.16 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.16 Manifest hash: /ipfs/QmedKTyCC4jnPAEmSHkvoYAUM4n3QcMjm1hCZZcGWHvN2x --- build/Dockerfile | 2 +- dappnode_package.json | 10 +- docker-compose.yml | 2 +- releases.json | 215 ------------------------------------------ 4 files changed, 6 insertions(+), 223 deletions(-) delete mode 100644 releases.json diff --git a/build/Dockerfile b/build/Dockerfile index 79572da..ebea3b9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.15 as geth +FROM ethereum/client-go:v1.10.16 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index e50a14b..2718526 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.35", - "upstream": "v1.10.15", + "version": "10.0.36", + "upstream": "v1.10.16", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", @@ -19,14 +19,12 @@ ], "environment": [ "EXTRA_OPTS=--http.api eth,net,web3,txpool" - ], - "size": 32799060 + ] }, "author": "AVADO", "license": "(C)", "links": { "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" - }, - "builddate": "2022-01-24T11:25:09.753Z" + } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 3c22d8e..6ebfb1b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.35' + image: 'ethchain-geth.public.dappnode.eth:10.0.36' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json deleted file mode 100644 index aa615e3..0000000 --- a/releases.json +++ /dev/null @@ -1,215 +0,0 @@ -{ - "10.0.6": { - "hash": "/ipfs/QmQQTXdx1drEcAY6JEkbP1Gbsiezg86bHDgtQgXs8wP1zi", - "type": "manifest", - "uploadedTo": { - "dappnode": "Sat, 30 May 2020 13:23:21 GMT" - } - }, - "10.0.7": { - "hash": "/ipfs/QmfApzg6nsWmgYkSm5gFyuF6EAtWP5yqPveSt5WifyARzP", - "type": "manifest", - "uploadedTo": { - "dappnode": "Sat, 30 May 2020 13:30:06 GMT" - } - }, - "10.0.8": { - "hash": "/ipfs/QmbHxRBk7J5eTqA5vEfaRmN8Dkh25SWh4gZsV1fgQexNFS", - "type": "manifest", - "uploadedTo": { - "dappnode": "Sat, 24 Oct 2020 14:44:06 GMT" - } - }, - "10.0.9": { - "hash": "/ipfs/QmRHTUevoFmPunDn5rRvXTKzJTa5FpZcVPMMWXXEsRz2nb", - "type": "manifest", - "uploadedTo": { - "dappnode": "Sat, 24 Oct 2020 19:08:52 GMT", - "http://23.254.227.151:5001": "Sat, 24 Oct 2020 19:21:36 GMT" - } - }, - "10.0.10": { - "hash": "/ipfs/QmaNskYJmRXCuCH2wj3EUsspGGzhunGLV6HNhaWPW4mmEi", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 10 Nov 2020 19:50:55 GMT" - } - }, - "10.0.11": { - "hash": "/ipfs/QmbuAuxqWw3GUTxpsYLT5cLkuH3pinqA7bknPwSqTpXYc6", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 12 Nov 2020 23:53:53 GMT" - } - }, - "10.0.12": { - "hash": "/ipfs/QmRo9GsgeAndLuerDLQZGeYpesFuWqTKZoejcMvmqou5fb", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 13 Nov 2020 09:22:36 GMT", - "dappnode": "Fri, 13 Nov 2020 09:40:30 GMT" - } - }, - "10.0.13": { - "hash": "/ipfs/QmYVK2wsys2QtKtmCocZ7vojPbFxqqg2bTcq5wjS6UTASG", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 08 Dec 2020 23:49:27 GMT", - "dappnode": "Tue, 08 Dec 2020 23:49:59 GMT" - } - }, - "10.0.14": { - "hash": "/ipfs/QmdB9F3JGXmFBW7kv5mp8N8mu48K8PB5TnXLueA4YBEAqy", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 02 Mar 2021 20:17:39 GMT" - } - }, - "10.0.15": { - "hash": "/ipfs/QmWXqS7V4SVxc2ZM9Qtr8dKDZZeHFm4eDshfxX3htG85up", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 09 Mar 2021 17:16:31 GMT" - } - }, - "10.0.16": { - "hash": "/ipfs/QmRFbpsdSEL6VC5c5iQzipMTeL2tVhK8YH4doC3uG2UWMX", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Sat, 13 Mar 2021 10:00:01 GMT" - } - }, - "10.0.17": { - "hash": "/ipfs/QmP16CgUEiwkk8tzdEPJc8kXufUkxczdM4ytGpn1jdii72", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 08 Apr 2021 15:07:47 GMT" - } - }, - "10.0.18": { - "hash": "/ipfs/QmbuwnATQbd9ZoYGcyHo7SjaL9msNX8FqUbjSmGXCZgQwF", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 05 May 2021 21:39:26 GMT" - } - }, - "10.0.19": { - "hash": "/ipfs/QmZNiiiNhaFbzJk5yn3w95J5DrC5r4K8Y9RBxByno8rYXa", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 11 Jun 2021 14:17:40 GMT" - } - }, - "10.0.20": { - "hash": "/ipfs/QmRXhn7HVaMZH6RgTQgQz9nMFi3aQtgHzdyB6DwmCMEaRN", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 02 Jul 2021 13:37:34 GMT" - } - }, - "10.0.21": { - "hash": "/ipfs/QmQFHvRJ1zrs3TET8Yb3vWTVK4xgJQv3KyVd4gScdaQMev", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 02 Jul 2021 13:22:38 GMT" - } - }, - "10.0.22": { - "hash": "/ipfs/QmSzcx9CzDuZ5fjfM9edee3tYdcqTTqN2ghVzAQRMoXGE7", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 14 Jul 2021 13:22:33 GMT" - } - }, - "10.0.23": { - "hash": "/ipfs/QmYsj2KPPTUBVUxraKrrGQgww5fiqZoikTW1ga2yvdCYTG", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 22 Jul 2021 18:10:04 GMT" - } - }, - "10.0.24": { - "hash": "/ipfs/QmdXM95ohgjyuMEZAMASxKBdhXKSrPorj8p4YW2jbbCBeX", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 12 Aug 2021 12:31:41 GMT" - } - }, - "10.0.25": { - "hash": "/ipfs/QmYWAoPfEcma7R8TWBFghckp7KM5phb4LYX6UjhzxGJHZs", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 24 Aug 2021 07:34:31 GMT" - } - }, - "10.0.26": { - "hash": "/ipfs/QmS5YcjC8ag6KTHDANhSo3FCnNXqY2UYNFkLvwzJ5w5g1q", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 29 Sep 2021 20:36:58 GMT" - } - }, - "10.0.27": { - "hash": "/ipfs/QmNfZD4LekbUqoGpg3ZxtQmH5uga7TVArDjAP1cYZan72P", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 06 Oct 2021 15:47:08 GMT" - } - }, - "10.0.28": { - "hash": "/ipfs/QmRF7napDMrxnR7dyph31T2RtqupkXSoGXjpMYBJxUwNNq", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:33:19 GMT" - } - }, - "10.0.29": { - "hash": "/ipfs/QmVrUSzH3DZzKEnkhmj1QYaDYUYCZ5rb4WUr7yFdk7aCVE", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 20 Oct 2021 13:52:18 GMT" - } - }, - "10.0.30": { - "hash": "/ipfs/QmYiY51SdENUfHZtdjfP9SH6MC8NZwHqiGM9whdYz26ncC", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Mon, 08 Nov 2021 16:27:58 GMT" - } - }, - "10.0.31": { - "hash": "/ipfs/QmNzgErAb2nciUEH9eu8g8d2N9BrrSQQV3HYwQ8wASQZ5m", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Mon, 22 Nov 2021 10:55:00 GMT" - } - }, - "10.0.32": { - "hash": "/ipfs/QmaCbc6Q1JLnrDnQR1MFeCM2GiK7Ey83CimTRN3uhsqe99", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 24 Nov 2021 13:22:17 GMT" - } - }, - "10.0.33": { - "hash": "/ipfs/Qmd1mzh9GrUBvBE5y69urdbQi4rkiHTJJYr4RorMrSku6c", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Thu, 23 Dec 2021 11:11:45 GMT" - } - }, - "10.0.34": { - "hash": "/ipfs/QmeHJXf24Wpvuhjw9xkwAE9oyRjgxJf1JS8Uu8EYbo3P53", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Fri, 07 Jan 2022 08:10:49 GMT" - } - }, - "10.0.35": { - "hash": "/ipfs/QmRjKywzkoq1GxgZsCNh1EuUy7zFPaGh3Lx2FXWNcooHDW", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Mon, 24 Jan 2022 11:25:09 GMT" - } - } -} \ No newline at end of file From cb3c7161cd94fe62d3eaa482e2f1003b687c7725 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 15 Feb 2022 15:37:51 +0000 Subject: [PATCH 54/95] Release ethchain-geth.public.dappnode.eth 10.0.36 Manifest hash: QmPBTsoKFVrPVFatZzWiLMKCpMobMmWwSsg5eQKiENLk61 --- releases.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 releases.json diff --git a/releases.json b/releases.json new file mode 100644 index 0000000..89fe3a1 --- /dev/null +++ b/releases.json @@ -0,0 +1,9 @@ +{ + "10.0.36": { + "hash": "/ipfs/QmPBTsoKFVrPVFatZzWiLMKCpMobMmWwSsg5eQKiENLk61", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Tue, 15 Feb 2022 15:32:34 GMT" + } + } +} \ No newline at end of file From e98881de47a14df53532dcdbddabe7524812b5ff Mon Sep 17 00:00:00 2001 From: stefaan Date: Sat, 5 Mar 2022 03:35:13 +0100 Subject: [PATCH 55/95] fixed URLS --- dappnode_package.json | 7 ++++--- docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 2718526..e9b3bd0 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.36", + "version": "10.0.37", "upstream": "v1.10.16", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -24,7 +24,8 @@ "author": "AVADO", "license": "(C)", "links": { - "RPC endpoint": "http://my.ethchain-geth.public.dappnode.eth:8545", - "RPC endpoint (SSL)": "https://my.ethchain-geth.public.dappnode.eth" + "RPC endpoint": "http://ethchain-geth.my.ava.do:8545", + "RPC endpoint (SSL)": "https://ethchain-geth.my.ava.do", + "WS endpoint": "ws://ethchain-geth.my.ava.do:8546" } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6ebfb1b..b3783a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.36' + image: 'ethchain-geth.public.dappnode.eth:10.0.37' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 56beef25a7e45c1fcf936cf692fe011d23f41f69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 5 Mar 2022 02:39:41 +0000 Subject: [PATCH 56/95] Release ethchain-geth.public.dappnode.eth 10.0.37 Manifest hash: QmcyZPoR6MSdWAhVCimNbg9ovZYNgykJQ3iQMkguQpgxrb --- releases.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/releases.json b/releases.json index 89fe3a1..9c0c1e4 100644 --- a/releases.json +++ b/releases.json @@ -5,5 +5,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Tue, 15 Feb 2022 15:32:34 GMT" } + }, + "10.0.37": { + "hash": "/ipfs/QmcyZPoR6MSdWAhVCimNbg9ovZYNgykJQ3iQMkguQpgxrb", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Sat, 05 Mar 2022 02:38:59 GMT" + } } } \ No newline at end of file From 6669f6254ae0bbfd7dbce9bdfa2287aa8afb5da6 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 30 Mar 2022 10:19:10 +0200 Subject: [PATCH 57/95] Update 10.0.38: geth v1.10.17 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.17 Manifest hash: /ipfs/QmVvEYTwCCJqSWddAB59PR2Q3pysUQoDVD95XXikjHHk5q --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index ebea3b9..05ce5a8 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.16 as geth +FROM ethereum/client-go:v1.10.17 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index e9b3bd0..66c87a0 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.37", - "upstream": "v1.10.16", + "version": "10.0.38", + "upstream": "v1.10.17", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index b3783a1..2b36837 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.37' + image: 'ethchain-geth.public.dappnode.eth:10.0.38' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index 9c0c1e4..d3948e0 100644 --- a/releases.json +++ b/releases.json @@ -12,5 +12,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Sat, 05 Mar 2022 02:38:59 GMT" } + }, + "10.0.38": { + "hash": "/ipfs/QmVvEYTwCCJqSWddAB59PR2Q3pysUQoDVD95XXikjHHk5q", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 30 Mar 2022 08:19:10 GMT" + } } } \ No newline at end of file From b40ed3e900e9765377a7913e433089edc7a843b3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Mar 2022 08:58:16 +0000 Subject: [PATCH 58/95] Release ethchain-geth.public.dappnode.eth 10.0.38 Manifest hash: Qma8gzG3nVAhF2NKufjtDopfNkQDLKRnnc2dsARsbqES24 --- releases.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases.json b/releases.json index d3948e0..ba45c5d 100644 --- a/releases.json +++ b/releases.json @@ -14,10 +14,10 @@ } }, "10.0.38": { - "hash": "/ipfs/QmVvEYTwCCJqSWddAB59PR2Q3pysUQoDVD95XXikjHHk5q", + "hash": "/ipfs/Qma8gzG3nVAhF2NKufjtDopfNkQDLKRnnc2dsARsbqES24", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 30 Mar 2022 08:19:10 GMT" + "http://80.208.229.228:5001": "Wed, 30 Mar 2022 08:33:35 GMT" } } } \ No newline at end of file From 07dbfa3c98aff1c93a3cc6ba77847d9946bf5fe5 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 15 Jun 2022 16:10:47 +0200 Subject: [PATCH 59/95] Update 10.0.40: geth v1.10.19 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.19 Manifest hash: /ipfs/QmaTRVs6x4735cDDHy3XGZt5HN6ukgjV4LsXtiRirbvikN --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- releases.json | 7 +++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 05ce5a8..2812a8b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM ethereum/client-go:v1.10.17 as geth +FROM ethereum/client-go:v1.10.19 as geth FROM node:12.14.1 as build-deps-wizard RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl diff --git a/dappnode_package.json b/dappnode_package.json index 66c87a0..d6d2a4a 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.38", - "upstream": "v1.10.17", + "version": "10.0.40", + "upstream": "v1.10.19", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 2b36837..7555709 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.38' + image: 'ethchain-geth.public.dappnode.eth:10.0.40' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json index ba45c5d..4aaaa6b 100644 --- a/releases.json +++ b/releases.json @@ -19,5 +19,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Wed, 30 Mar 2022 08:33:35 GMT" } + }, + "10.0.40": { + "hash": "/ipfs/QmaTRVs6x4735cDDHy3XGZt5HN6ukgjV4LsXtiRirbvikN", + "type": "manifest", + "uploadedTo": { + "http://80.208.229.228:5001": "Wed, 15 Jun 2022 14:10:47 GMT" + } } } \ No newline at end of file From 5bed8929ba2f8b659bba3344edf1c6ef1f16011a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 15 Jun 2022 16:06:05 +0000 Subject: [PATCH 60/95] Release ethchain-geth.public.dappnode.eth 10.0.40 Manifest hash: QmSrQ8voYG1U1LAerqY8m2KJwQQ2k7Ft6qTQHWTYjkG2ry --- releases.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releases.json b/releases.json index 4aaaa6b..4f2fd12 100644 --- a/releases.json +++ b/releases.json @@ -21,10 +21,10 @@ } }, "10.0.40": { - "hash": "/ipfs/QmaTRVs6x4735cDDHy3XGZt5HN6ukgjV4LsXtiRirbvikN", + "hash": "/ipfs/QmSrQ8voYG1U1LAerqY8m2KJwQQ2k7Ft6qTQHWTYjkG2ry", "type": "manifest", "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 15 Jun 2022 14:10:47 GMT" + "http://80.208.229.228:5001": "Wed, 15 Jun 2022 14:58:01 GMT" } } } \ No newline at end of file From 2686721fb212e1ff884be8a41508153b7f178231 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 27 Jun 2022 16:23:23 +0200 Subject: [PATCH 61/95] Simplified dockerfile + updated certificates + removed releases.json --- .gitignore | 1 + build/Dockerfile | 26 ++++++++------------------ dappnode_package.json | 2 +- docker-compose.yml | 2 +- releases.json | 30 ------------------------------ 5 files changed, 11 insertions(+), 50 deletions(-) delete mode 100644 releases.json diff --git a/.gitignore b/.gitignore index 2bd624b..c561709 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build_* +releases.json diff --git a/build/Dockerfile b/build/Dockerfile index 2812a8b..24cc458 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,27 +1,17 @@ -FROM ethereum/client-go:v1.10.19 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.10.19 as geth -FROM node:12.14.1 as build-deps-wizard -RUN apt-get update && apt-get install -y libusb-1.0-0-dev libudev-dev openssl - -WORKDIR /cert -ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache -RUN wget http://iso.ava.do/my.ava.do.crt -RUN wget http://iso.ava.do/my.ava.do.key - -FROM alpine:latest - -COPY --from=geth /usr/local/bin/geth /usr/local/bin/geth - -RUN apk update && apk add --no-cache supervisor nginx +RUN apk update && apk add --no-cache \ + supervisor \ + nginx \ + && rm -rf /var/cache/apk/* && rm -rf /tmp/* #RUN adduser -D nginx -RUN rm -rf /tmp/* -RUN rm -rf /var/cache/apk/* # Set up nginx config RUN mkdir -p /etc/nginx/certs/ -COPY --from=build-deps-wizard /cert/my.ava.do.crt /etc/nginx/certs/my.ava.do.crt -COPY --from=build-deps-wizard /cert/my.ava.do.key /etc/nginx/certs/my.ava.do.key +WORKDIR /etc/nginx/certs/ +ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache +RUN wget http://iso.ava.do/my.ava.do.crt && wget http://iso.ava.do/my.ava.do.key RUN ls -l /etc/nginx/certs/ COPY files/nginx.conf /etc/nginx diff --git a/dappnode_package.json b/dappnode_package.json index d6d2a4a..eb0ac57 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.40", + "version": "10.0.41", "upstream": "v1.10.19", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", diff --git a/docker-compose.yml b/docker-compose.yml index 7555709..e1dc0cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.40' + image: 'ethchain-geth.public.dappnode.eth:10.0.41' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' diff --git a/releases.json b/releases.json deleted file mode 100644 index 4f2fd12..0000000 --- a/releases.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "10.0.36": { - "hash": "/ipfs/QmPBTsoKFVrPVFatZzWiLMKCpMobMmWwSsg5eQKiENLk61", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Tue, 15 Feb 2022 15:32:34 GMT" - } - }, - "10.0.37": { - "hash": "/ipfs/QmcyZPoR6MSdWAhVCimNbg9ovZYNgykJQ3iQMkguQpgxrb", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Sat, 05 Mar 2022 02:38:59 GMT" - } - }, - "10.0.38": { - "hash": "/ipfs/Qma8gzG3nVAhF2NKufjtDopfNkQDLKRnnc2dsARsbqES24", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 30 Mar 2022 08:33:35 GMT" - } - }, - "10.0.40": { - "hash": "/ipfs/QmSrQ8voYG1U1LAerqY8m2KJwQQ2k7Ft6qTQHWTYjkG2ry", - "type": "manifest", - "uploadedTo": { - "http://80.208.229.228:5001": "Wed, 15 Jun 2022 14:58:01 GMT" - } - } -} \ No newline at end of file From 1ef745557de73c0a156aea24fb76fedef1422ede Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 28 Jun 2022 16:22:38 +0200 Subject: [PATCH 62/95] Check for updated Avado certificates daily --- build/Dockerfile | 3 ++- build/files/reload-certs.sh | 23 +++++++++++++++++++++++ build/files/supervisord.conf | 9 ++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 build/files/reload-certs.sh diff --git a/build/Dockerfile b/build/Dockerfile index 24cc458..da1d9cb 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -21,6 +21,7 @@ COPY ./files/supervisord.conf /etc/supervisord.conf # Startup script COPY ./files/start.sh /opt/start.sh -RUN chmod +x /opt/start.sh +COPY ./files/reload-certs.sh /opt/reload-certs.sh +RUN chmod +x /opt/start.sh /opt/reload-certs.sh ENTRYPOINT ["/opt/start.sh"] \ No newline at end of file diff --git a/build/files/reload-certs.sh b/build/files/reload-certs.sh new file mode 100644 index 0000000..887993f --- /dev/null +++ b/build/files/reload-certs.sh @@ -0,0 +1,23 @@ +#!/bin/sh +while true; do + date > /tmp/reload-certs.txt + + echo "Check for updated certificates" + + md5sumbefore=$(md5sum "/etc/nginx/certs/my.ava.do.crt") + + wget -q -O /etc/nginx/certs/my.ava.do.crt http://iso.ava.do/my.ava.do.crt + wget -q -O /etc/nginx/certs/my.ava.do.key http://iso.ava.do/my.ava.do.key + + md5sumafter=$(md5sum "/etc/nginx/certs/my.ava.do.crt") + + if [ "$md5sumbefore" != "$md5sumafter" ]; then + if [ -e /var/run/nginx/nginx.pid ]; then + echo "Reload nginx" + nginx -s reload + fi + fi + + #sleep one day + sleep 86400 +done diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index 2500831..d373133 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -24,7 +24,6 @@ stderr_logfile_maxbytes=0 killasgroup=true stopasgroup=true - [program:nginx] command=nginx -c /etc/nginx/nginx.conf -g "daemon off;" autostart=true @@ -32,3 +31,11 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 + +[program:reload-certs] +command=/opt/reload-certs.sh +autostart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 From d1d2dc100d7a9e49f5a3c0ff83c1c82364e03d0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 29 Jun 2022 15:27:46 +0000 Subject: [PATCH 63/95] Release ethchain-geth.public.dappnode.eth 10.0.41 Manifest hash: Qmb5vY44Z91WPSARoY24EwUaVajgcJe3k1UueS6uwUj1TG From 1742faf15185e3d0bc64e2144b61b899c000243f Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Sun, 31 Jul 2022 18:00:39 +0200 Subject: [PATCH 64/95] Update 10.0.42: geth v1.10.21 https://github.com/ethereum/go-ethereum/releases/tag/v1.10.21 Manifest hash: --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index da1d9cb..fc8a376 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.10.19 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.10.21 as geth RUN apk update && apk add --no-cache \ supervisor \ diff --git a/dappnode_package.json b/dappnode_package.json index eb0ac57..230639a 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.41", - "upstream": "v1.10.19", + "version": "10.0.42", + "upstream": "v1.10.21", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index e1dc0cc..d6605f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.41' + image: 'ethchain-geth.public.dappnode.eth:10.0.42' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 695681a135259b69df485535919292334c064194 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 1 Aug 2022 10:07:05 +0000 Subject: [PATCH 65/95] Release ethchain-geth.public.dappnode.eth 10.0.42 Manifest hash: QmeE8PMZewo1o3n1FBZuHmhKcZTyLS7sQQ46YxRRVhWQSx From c238184885ca2de7e581ceaaa96b51a41ed4de12 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 15 Aug 2022 12:06:33 +0200 Subject: [PATCH 66/95] Updates for "The Merge" --- build/Dockerfile | 7 ++++--- build/files/nginx.conf | 11 +++++++++++ build/files/start.sh | 38 ++++++++++++++++++++++++++++++++++---- dappnode_package.json | 5 +++-- docker-compose.yml | 5 +++-- 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index fc8a376..467997a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,12 +1,13 @@ FROM --platform=linux/amd64 ethereum/client-go:v1.10.21 as geth RUN apk update && apk add --no-cache \ - supervisor \ + bash \ + ca-certificates \ nginx \ + openssl \ + supervisor \ && rm -rf /var/cache/apk/* && rm -rf /tmp/* -#RUN adduser -D nginx - # Set up nginx config RUN mkdir -p /etc/nginx/certs/ WORKDIR /etc/nginx/certs/ diff --git a/build/files/nginx.conf b/build/files/nginx.conf index 5f0d97a..7e35a73 100644 --- a/build/files/nginx.conf +++ b/build/files/nginx.conf @@ -64,6 +64,17 @@ http { proxy_pass http://localhost:8545; proxy_read_timeout 90; } + + root /usr/share/nginx/wizard; + + location /jwttoken { + # kill cache + add_header Last-Modified $date_gmt; + add_header Cache-Control 'no-store, no-cache'; + if_modified_since off; + expires off; + etag off; + } } } \ No newline at end of file diff --git a/build/files/start.sh b/build/files/start.sh index 6cc0810..e934db3 100644 --- a/build/files/start.sh +++ b/build/files/start.sh @@ -1,11 +1,41 @@ #!/bin/sh # Older installations use the deprecated option "--rpcapi" so replace it by "--http.api" -export EXTRA_OPTS_PARSED=`echo -n $EXTRA_OPTS | sed s/--rpcapi/--http\.api/g` -export GETH_CMD="/usr/local/bin/geth --datadir /root/.ethereum/ethchain-geth --http --http.addr 0.0.0.0 --http.corsdomain "*" --http.vhosts "*" --ws --ws.origins "*" --ws.addr 0.0.0.0 --rpc.gascap 0 --cache 4096 $EXTRA_OPTS_PARSED" +export EXTRA_OPTS_PARSED=$(echo -n $EXTRA_OPTS | sed s/st--rpcapi/--http\.api/g) -echo "EXTRA_OPTS=$EXTRA_OPTS" -echo "EXTRA_OPTS_PARSED=$EXTRA_OPTS_PARSED" +# Create JWTToken if it does not exist yet +JWT_TOKEN="/root/.ethereum/ethchain-geth/geth/jwttoken" +if [ ! -f ${JWT_TOKEN} ]; then + echo "Creating JWT Token" + mkdir -p "/root/.ethereum/ethchain-geth/geth/" + openssl rand -hex 32 | tr -d "\n" >${JWT_TOKEN} + cat ${JWT_TOKEN} +fi + +# make JWT token available via nginx +mkdir -p /usr/share/nginx/wizard/ +cat ${JWT_TOKEN} | tail -1 >/usr/share/nginx/wizard/jwttoken +chmod 644 /usr/share/nginx/wizard/jwttoken + +export GETH_CMD="/usr/local/bin/geth \ + --datadir /root/.ethereum/ethchain-geth\ + --mainnet \ + --http \ + --http.addr=\"0.0.0.0\" \ + --http.corsdomain=\"*\" \ + --http.vhosts=\"*\" \ + --ws \ + --ws.origins=\"*\" \ + --ws.addr=\"0.0.0.0\" \ + --authrpc.vhosts=\"*\" \ + --authrpc.addr=\"0.0.0.0\" \ + --authrpc.port=\"8551\" \ + --authrpc.jwtsecret=\"${JWT_TOKEN}\" \ + --rpc.gascap 0 \ + --cache 4096 \ + ${EXTRA_OPTS_PARSED}" + +echo "EXTRA_OPTS=$EXTRA_OPTS_PARSED" echo "GETH_CMD=$GETH_CMD" # Print version to the log diff --git a/dappnode_package.json b/dappnode_package.json index 230639a..77a5850 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.42", + "version": "10.0.43", "upstream": "v1.10.21", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", @@ -26,6 +26,7 @@ "links": { "RPC endpoint": "http://ethchain-geth.my.ava.do:8545", "RPC endpoint (SSL)": "https://ethchain-geth.my.ava.do", - "WS endpoint": "ws://ethchain-geth.my.ava.do:8546" + "WS endpoint": "ws://ethchain-geth.my.ava.do:8546", + "EE endpoint (http)": "http://ethchain-geth.my.ava.do:8551" } } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index d6605f6..2874470 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.42' + image: 'ethchain-geth.public.dappnode.eth:10.0.43' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' @@ -9,8 +9,9 @@ services: - EXTRA_OPTS= ports: - '443:443' - - '8546:8546' - '8545:8545' + - '8546:8546' + - '8551:8551' - '30303:30303' - '30303:30303/udp' volumes: From 5aa573a447b92f9ae687dec795f878a78192bbce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 15 Aug 2022 16:14:51 +0000 Subject: [PATCH 67/95] Release ethchain-geth.public.dappnode.eth 10.0.43 Manifest hash: QmQ5hqUqyAM51edQog1ra71h8Bg9BfYAqtHuxpxdSecizt From ac55992a29ebdb4c7da5f5538eb0c22495186a00 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 22 Aug 2022 11:59:01 +0200 Subject: [PATCH 68/95] v1.10.22 --- build/Dockerfile | 2 +- build/files/start.sh | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 467997a..7c557e6 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.10.21 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.10.22 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/build/files/start.sh b/build/files/start.sh index e934db3..c89341d 100644 --- a/build/files/start.sh +++ b/build/files/start.sh @@ -42,4 +42,4 @@ echo "GETH_CMD=$GETH_CMD" /usr/local/bin/geth version # Start supervisor -/usr/bin/supervisord -c /etc/supervisord.conf +exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/dappnode_package.json b/dappnode_package.json index 77a5850..da2c1de 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.43", - "upstream": "v1.10.21", + "version": "10.0.44", + "upstream": "v1.10.22", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 2874470..8ca68b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.43' + image: 'ethchain-geth.public.dappnode.eth:10.0.44' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 9b0c727be10e55e7ade5aed5a43d8e36b3f8ea68 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 24 Aug 2022 12:59:04 +0200 Subject: [PATCH 69/95] v1.10.23 --- build/Dockerfile | 2 +- build/files/supervisord.conf | 1 + dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 7c557e6..8e491f5 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.10.22 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.10.23 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index d373133..103389a 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -23,6 +23,7 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 killasgroup=true stopasgroup=true +stopwaitsecs=120 [program:nginx] command=nginx -c /etc/nginx/nginx.conf -g "daemon off;" diff --git a/dappnode_package.json b/dappnode_package.json index da2c1de..0141d61 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.44", - "upstream": "v1.10.22", + "version": "10.0.45", + "upstream": "v1.10.23", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 8ca68b4..2681a49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.44' + image: 'ethchain-geth.public.dappnode.eth:10.0.45' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 4a10f03ef49a3bcb18c0bb0ce13bbb0aeec03b0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Aug 2022 07:20:53 +0000 Subject: [PATCH 70/95] Release ethchain-geth.public.dappnode.eth 10.0.45 Manifest hash: QmS6mQLmVtLdmbAvrBsg61FMrbeX1T5EV7zyFceMbbJZ92 From eceb2d7ee9194f068dae20f8ebaa95138354b583 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 15 Sep 2022 19:21:42 +0200 Subject: [PATCH 71/95] geth v1.10.25 --- build/Dockerfile | 2 +- build/files/start.sh | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 8e491f5..6dd23e8 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.10.23 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.10.25 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/build/files/start.sh b/build/files/start.sh index c89341d..f2441d7 100644 --- a/build/files/start.sh +++ b/build/files/start.sh @@ -1,7 +1,7 @@ #!/bin/sh # Older installations use the deprecated option "--rpcapi" so replace it by "--http.api" -export EXTRA_OPTS_PARSED=$(echo -n $EXTRA_OPTS | sed s/st--rpcapi/--http\.api/g) +export EXTRA_OPTS_PARSED=$(echo -n $EXTRA_OPTS | sed s/--rpcapi/--http\.api/g) # Create JWTToken if it does not exist yet JWT_TOKEN="/root/.ethereum/ethchain-geth/geth/jwttoken" diff --git a/dappnode_package.json b/dappnode_package.json index 0141d61..185d7cd 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.45", - "upstream": "v1.10.23", + "version": "10.0.46", + "upstream": "v1.10.25", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 2681a49..d8cbf0c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.45' + image: 'ethchain-geth.public.dappnode.eth:10.0.46' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 4ad071e9d4084b4c601e736abed55322a6dc7caf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 16 Sep 2022 08:46:23 +0000 Subject: [PATCH 72/95] Release ethchain-geth.public.dappnode.eth 10.0.46 Manifest hash: QmTqe6WM7RKU55YyBfjoXNiLx3FvqX9h2rrvESXgWLrD2m From b0f5de165c976e553db865bfdb35184f466280e2 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Mon, 7 Nov 2022 12:14:43 +0100 Subject: [PATCH 73/95] v1.10.26 --- build/Dockerfile | 4 ++-- build/files/start.sh | 1 + dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 6dd23e8..7936657 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.10.25 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.10.26 as geth RUN apk update && apk add --no-cache \ bash \ @@ -25,4 +25,4 @@ COPY ./files/start.sh /opt/start.sh COPY ./files/reload-certs.sh /opt/reload-certs.sh RUN chmod +x /opt/start.sh /opt/reload-certs.sh -ENTRYPOINT ["/opt/start.sh"] \ No newline at end of file +ENTRYPOINT ["/opt/start.sh"] diff --git a/build/files/start.sh b/build/files/start.sh index f2441d7..b572c14 100644 --- a/build/files/start.sh +++ b/build/files/start.sh @@ -42,4 +42,5 @@ echo "GETH_CMD=$GETH_CMD" /usr/local/bin/geth version # Start supervisor +# (using exec: https://madflojo.medium.com/shutdown-signals-with-docker-entry-point-scripts-5e560f4e2d45) exec /usr/bin/supervisord -c /etc/supervisord.conf diff --git a/dappnode_package.json b/dappnode_package.json index 185d7cd..4ba6c11 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.46", - "upstream": "v1.10.25", + "version": "10.0.47", + "upstream": "v1.10.26", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index d8cbf0c..46d66c8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.46' + image: 'ethchain-geth.public.dappnode.eth:10.0.47' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From e4530abf5d60b2611ab046c5d27645428d4d9c1b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 7 Nov 2022 11:44:12 +0000 Subject: [PATCH 74/95] Release ethchain-geth.public.dappnode.eth 10.0.47 Manifest hash: QmeAZdZHp1r8gW22WHCkQdz2hPx7HnWSHAfjQvjfckDmFT From 33cc04cb96894af5af6584a3c02f0360c70bad9c Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 3 Jan 2023 19:07:43 +0100 Subject: [PATCH 75/95] Use Dappmanager's JWT Token --- build/Dockerfile | 1 + build/files/nginx.conf | 9 --------- build/files/reload-certs.sh | 6 ++---- build/files/start.sh | 18 ++++++------------ dappnode_package.json | 2 +- docker-compose.yml | 2 +- 6 files changed, 11 insertions(+), 27 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 7936657..37c9a0a 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -3,6 +3,7 @@ FROM --platform=linux/amd64 ethereum/client-go:v1.10.26 as geth RUN apk update && apk add --no-cache \ bash \ ca-certificates \ + curl \ nginx \ openssl \ supervisor \ diff --git a/build/files/nginx.conf b/build/files/nginx.conf index 7e35a73..f441ed9 100644 --- a/build/files/nginx.conf +++ b/build/files/nginx.conf @@ -66,15 +66,6 @@ http { } root /usr/share/nginx/wizard; - - location /jwttoken { - # kill cache - add_header Last-Modified $date_gmt; - add_header Cache-Control 'no-store, no-cache'; - if_modified_since off; - expires off; - etag off; - } } } \ No newline at end of file diff --git a/build/files/reload-certs.sh b/build/files/reload-certs.sh index 887993f..7c37c33 100644 --- a/build/files/reload-certs.sh +++ b/build/files/reload-certs.sh @@ -5,10 +5,8 @@ while true; do echo "Check for updated certificates" md5sumbefore=$(md5sum "/etc/nginx/certs/my.ava.do.crt") - - wget -q -O /etc/nginx/certs/my.ava.do.crt http://iso.ava.do/my.ava.do.crt - wget -q -O /etc/nginx/certs/my.ava.do.key http://iso.ava.do/my.ava.do.key - + wget -q -O /etc/nginx/certs/my.ava.do.crt "http://dappmanager.my.ava.do/my.ava.do.crt" + wget -q -O /etc/nginx/certs/my.ava.do.key "http://dappmanager.my.ava.do/my.ava.do.key" md5sumafter=$(md5sum "/etc/nginx/certs/my.ava.do.crt") if [ "$md5sumbefore" != "$md5sumafter" ]; then diff --git a/build/files/start.sh b/build/files/start.sh index b572c14..5a1f5e7 100644 --- a/build/files/start.sh +++ b/build/files/start.sh @@ -3,19 +3,13 @@ # Older installations use the deprecated option "--rpcapi" so replace it by "--http.api" export EXTRA_OPTS_PARSED=$(echo -n $EXTRA_OPTS | sed s/--rpcapi/--http\.api/g) -# Create JWTToken if it does not exist yet +# Get JWT Token JWT_TOKEN="/root/.ethereum/ethchain-geth/geth/jwttoken" -if [ ! -f ${JWT_TOKEN} ]; then - echo "Creating JWT Token" - mkdir -p "/root/.ethereum/ethchain-geth/geth/" - openssl rand -hex 32 | tr -d "\n" >${JWT_TOKEN} - cat ${JWT_TOKEN} -fi - -# make JWT token available via nginx -mkdir -p /usr/share/nginx/wizard/ -cat ${JWT_TOKEN} | tail -1 >/usr/share/nginx/wizard/jwttoken -chmod 644 /usr/share/nginx/wizard/jwttoken +mkdir -p $(dirname ${JWT_TOKEN}) +until $(curl --silent --fail "http://dappmanager.my.ava.do/jwttoken.txt" --output "${JWT_TOKEN}"); do + echo "Waiting for the JWT Token" + sleep 5 +done export GETH_CMD="/usr/local/bin/geth \ --datadir /root/.ethereum/ethchain-geth\ diff --git a/dappnode_package.json b/dappnode_package.json index 4ba6c11..615546b 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,6 +1,6 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.47", + "version": "10.0.48", "upstream": "v1.10.26", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", diff --git a/docker-compose.yml b/docker-compose.yml index 46d66c8..92b8a88 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.47' + image: 'ethchain-geth.public.dappnode.eth:10.0.48' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 35279300c575d06b4e306221be1a9cc902a043ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 17 Jan 2023 09:44:14 +0000 Subject: [PATCH 76/95] Release ethchain-geth.public.dappnode.eth 10.0.48 Manifest hash: Qmc7wH7C55UgPFkRPAy3ULKsRWS8E1ZV25miHBWM9vW6iV From 33acb37c1f215618d46a0af523ff2bfa33ce4745 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 16 Feb 2023 11:09:37 +0100 Subject: [PATCH 77/95] Geth v1.11.0 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 37c9a0a..d88b2f7 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.10.26 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.11.0 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index 615546b..fd8a352 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.48", - "upstream": "v1.10.26", + "version": "10.0.49", + "upstream": "v1.11.0", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 92b8a88..22c21e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.48' + image: 'ethchain-geth.public.dappnode.eth:10.0.49' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 710f1e0ae710c8539416ad3798bad3edc552d7b4 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 17 Feb 2023 09:34:40 +0100 Subject: [PATCH 78/95] Updated workflow files --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d624af4..41d2299 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,6 @@ name: Build on: pull_request jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: AvadoDServer/ci-build-action@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8dc920..bad24b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: - master jobs: release: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: AvadoDServer/ci-release-action@main with: From d78445f6f8568cab65e402b5be9af5ee72b686cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 17 Feb 2023 08:50:22 +0000 Subject: [PATCH 79/95] Release ethchain-geth.public.dappnode.eth 10.0.49 Manifest hash: QmcwtkSzWmdd9TPYWKRe6mRU34VmPVZQq6cejdfiJ3V48d From 869c5f773c90b39066d35e9e4ca7271a08e6a5af Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 22 Feb 2023 15:15:19 +0100 Subject: [PATCH 80/95] Geth v1.11.2 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index d88b2f7..d583af4 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.11.0 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.11.2 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index fd8a352..ed9bb88 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.49", - "upstream": "v1.11.0", + "version": "10.0.50", + "upstream": "v1.11.2", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 22c21e9..df0380e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.49' + image: 'ethchain-geth.public.dappnode.eth:10.0.50' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 582da5560b6879370afee92031602d4d50f9579d Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 22 Feb 2023 15:23:32 +0100 Subject: [PATCH 81/95] Try to avoid GitHub build issue TypeError: RequestInit: duplex option is required when sending a body. --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41d2299..d624af4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,6 @@ name: Build on: pull_request jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-18.04 steps: - uses: AvadoDServer/ci-build-action@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bad24b8..a8dc920 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: - master jobs: release: - runs-on: ubuntu-22.04 + runs-on: ubuntu-18.04 steps: - uses: AvadoDServer/ci-release-action@main with: From 35f06621bd317c551e4a34e2e9fd201329d427b8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 22 Feb 2023 14:34:51 +0000 Subject: [PATCH 82/95] Release ethchain-geth.public.dappnode.eth 10.0.50 Manifest hash: Qmbh9RLBFEV4apoCbfMEyy2kJ3vsqrmbPDKQLtetrAdi1s From 84ce83e274b0fa6e27341af503401fd3386b9587 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Wed, 8 Mar 2023 10:13:18 +0100 Subject: [PATCH 83/95] Geth v1.11.3 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index d583af4..a26d62f 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.11.2 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.11.3 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index ed9bb88..d41f46d 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.50", - "upstream": "v1.11.2", + "version": "10.0.51", + "upstream": "v1.11.3", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index df0380e..9c5d231 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.50' + image: 'ethchain-geth.public.dappnode.eth:10.0.51' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 0bcab903a48890954901161cc7762bf264d3f5d6 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 21 Mar 2023 21:59:08 +0100 Subject: [PATCH 84/95] Geth v1.11.5 --- build/Dockerfile | 3 ++- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index a26d62f..aa07d03 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,9 +1,10 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.11.3 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.11.5 as geth RUN apk update && apk add --no-cache \ bash \ ca-certificates \ curl \ + lsb-release \ nginx \ openssl \ supervisor \ diff --git a/dappnode_package.json b/dappnode_package.json index d41f46d..700b92a 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.51", - "upstream": "v1.11.3", + "version": "10.0.52", + "upstream": "v1.11.5", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 9c5d231..f72063b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.51' + image: 'ethchain-geth.public.dappnode.eth:10.0.52' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 67b8af6df96d0d1b95c22e6102157738a10c8426 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 21 Mar 2023 21:24:57 +0000 Subject: [PATCH 85/95] Release ethchain-geth.public.dappnode.eth 10.0.52 Manifest hash: QmWmFoL1TACsjMFrgNk9cYFj6rtp5R6GA2796eQhi1CycZ From d5c193cc7ad99687ccb968fbc10b99a3004163ec Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Thu, 20 Apr 2023 21:59:15 +0200 Subject: [PATCH 86/95] geth v1.11.6 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index aa07d03..b3e7f56 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.11.5 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.11.6 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index 700b92a..8f7e5d6 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.52", - "upstream": "v1.11.5", + "version": "10.0.53", + "upstream": "v1.11.6", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index f72063b..16ebba6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.52' + image: 'ethchain-geth.public.dappnode.eth:10.0.53' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From f7164330dcb8f0fee91d7a561e02a2e0b152d896 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 21 Apr 2023 12:21:55 +0200 Subject: [PATCH 87/95] Build with ubuntu 22.04 --- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d624af4..41d2299 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,6 +2,6 @@ name: Build on: pull_request jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: AvadoDServer/ci-build-action@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8dc920..bad24b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: - master jobs: release: - runs-on: ubuntu-18.04 + runs-on: ubuntu-22.04 steps: - uses: AvadoDServer/ci-release-action@main with: From 833a7ef6df2a57a5bcaadd5a01303d6644d38b93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 21 Apr 2023 10:26:22 +0000 Subject: [PATCH 88/95] Release ethchain-geth.public.dappnode.eth 10.0.53 Manifest hash: QmPdrpS4rMp5KdwSMctfY19ZhVB4MSjahdw8LoYzicGrNU From aea66a9c22021de778441f4d0dd61cd7cf099fb1 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 26 May 2023 22:08:33 +0200 Subject: [PATCH 89/95] Geth v1.12.0 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index b3e7f56..08d454e 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.11.6 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.12.0 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index 8f7e5d6..eebb5f5 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.53", - "upstream": "v1.11.6", + "version": "10.0.54", + "upstream": "v1.12.0", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 16ebba6..6f18873 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.53' + image: 'ethchain-geth.public.dappnode.eth:10.0.54' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 4cc60c451b1ecf7d6af6c6f119af1787733abf54 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 26 May 2023 20:58:30 +0000 Subject: [PATCH 90/95] Release ethchain-geth.public.dappnode.eth 10.0.54 Manifest hash: QmbuTAfgVbcz8VuiM659NEXCDBcPqMrLS5GehzMZiQMpi2 From d3cc5f337159ef8106730335628b48649c434121 Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Fri, 11 Aug 2023 22:56:49 +0200 Subject: [PATCH 91/95] geth v1.12.1 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 08d454e..81c8e25 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.12.0 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.12.1 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index eebb5f5..f4c6aec 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.54", - "upstream": "v1.12.0", + "version": "10.0.55", + "upstream": "v1.12.1", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 6f18873..d715190 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.54' + image: 'ethchain-geth.public.dappnode.eth:10.0.55' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 33dfc0df50a5376c0eb97f3293d5ee44fc84c55a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 11 Aug 2023 21:01:30 +0000 Subject: [PATCH 92/95] Release ethchain-geth.public.dappnode.eth 10.0.55 Manifest hash: Qmbc7CGWcgbqPQRN8FuGSnt9NCceALrbR8toL2GGAUbkCL From eef491995e510374c4ad8a27ac650b03cad1beba Mon Sep 17 00:00:00 2001 From: Hendrik Eeckhaut Date: Tue, 12 Sep 2023 13:49:00 +0200 Subject: [PATCH 93/95] geth v1.13.0 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 81c8e25..1795335 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.12.1 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.13.0 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index f4c6aec..8ca2b8e 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.55", - "upstream": "v1.12.1", + "version": "10.0.56", + "upstream": "v1.13.0", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index d715190..1d9b8a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.55' + image: 'ethchain-geth.public.dappnode.eth:10.0.56' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth' From 2231328982673d4acd2efc0d43de03257ea599b7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 17 Sep 2023 09:10:56 +0000 Subject: [PATCH 94/95] Release ethchain-geth.public.dappnode.eth 10.0.56 Manifest hash: QmXCzP5U1kEXQGrceG5yJfynRX5KkR1N7aDXE1f2cNW9Wj From fb515abad57ea214782222dce1c244ece9bdb67b Mon Sep 17 00:00:00 2001 From: sponnet Date: Sun, 17 Sep 2023 22:09:38 +0200 Subject: [PATCH 95/95] bump to 1.13.1 --- build/Dockerfile | 2 +- dappnode_package.json | 4 ++-- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1795335..4c03bf8 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 ethereum/client-go:v1.13.0 as geth +FROM --platform=linux/amd64 ethereum/client-go:v1.13.1 as geth RUN apk update && apk add --no-cache \ bash \ diff --git a/dappnode_package.json b/dappnode_package.json index 8ca2b8e..c0c6bcb 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "ethchain-geth.public.dappnode.eth", - "version": "10.0.56", - "upstream": "v1.13.0", + "version": "10.0.57", + "upstream": "v1.13.1", "autoupdate": true, "title": "Ethereum node (Geth + mainnet)", "description": "Ethereum Client - based on Geth", diff --git a/docker-compose.yml b/docker-compose.yml index 1d9b8a0..65bef70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: ethchain-geth.public.dappnode.eth: - image: 'ethchain-geth.public.dappnode.eth:10.0.56' + image: 'ethchain-geth.public.dappnode.eth:10.0.57' build: ./build volumes: - 'ethchain-geth:/root/.ethereum/ethchain-geth'

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%0AIWB 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