From 3872cb270cad17a9cc06f391de14487b97f5343e Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Mon, 9 Dec 2019 17:50:17 +0700 Subject: [PATCH 1/6] Only copy bitcoind and bitcoin-cli binaries from bitcoin-core build stage --- 0.19/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/0.19/Dockerfile b/0.19/Dockerfile index dfdcd6c..c1d00fb 100644 --- a/0.19/Dockerfile +++ b/0.19/Dockerfile @@ -150,7 +150,8 @@ ENV PATH="${BITCOIN_PREFIX}/bin:$PATH" VOLUME /root/.bitcoin -COPY --from=bitcoin-core /opt /opt +COPY --from=bitcoin-core "${BITCOIN_PREFIX}/bin/bitcoind" /usr/local/bin/ +COPY --from=bitcoin-core "${BITCOIN_PREFIX}/bin/bitcoin-cli" /usr/local/bin/ # REST interface EXPOSE 8080 From b5323712db836b4df5cbad8c6f6faf431613c491 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Mon, 9 Dec 2019 17:51:31 +0700 Subject: [PATCH 2/6] Remove redundant PATH update --- 0.19/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/0.19/Dockerfile b/0.19/Dockerfile index c1d00fb..25a27fb 100644 --- a/0.19/Dockerfile +++ b/0.19/Dockerfile @@ -146,7 +146,6 @@ ARG VERSION=0.19.0.1 ENV BITCOIN_VERSION=${VERSION} ENV BITCOIN_PREFIX="/opt/bitcoin-${BITCOIN_VERSION}" -ENV PATH="${BITCOIN_PREFIX}/bin:$PATH" VOLUME /root/.bitcoin From 296722d2342e6af4dc8277de8909ea912327b28a Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Mon, 9 Dec 2019 18:43:12 +0700 Subject: [PATCH 3/6] Include all built Bitcoin Core binaries --- 0.19/.Dockerfile.swp | Bin 0 -> 16384 bytes 0.19/Dockerfile | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 0.19/.Dockerfile.swp diff --git a/0.19/.Dockerfile.swp b/0.19/.Dockerfile.swp new file mode 100644 index 0000000000000000000000000000000000000000..b926a9433a8f0cc14233ee95f9d81759e93f8173 GIT binary patch literal 16384 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 Z^6r&dp`O(_oAkv_HXt&I@jA_;{1 Date: Mon, 9 Dec 2019 18:44:24 +0700 Subject: [PATCH 4/6] Don't strip lib files --- 0.19/.Dockerfile.swp | Bin 16384 -> 16384 bytes 0.19/Dockerfile | 2 -- 2 files changed, 2 deletions(-) diff --git a/0.19/.Dockerfile.swp b/0.19/.Dockerfile.swp index b926a9433a8f0cc14233ee95f9d81759e93f8173..fe3723dac189ab7b5636eac56e93cb14f113ab6e 100644 GIT binary patch delta 232 zcmWm8J8HrJ0Eh8^phM!L#uJnZijO7LDHUJntcP&a1GpKe!~-PIMZJK=7IFa3AW^rD zQe3+90)7rZ_{Puk49_#Z9ouNcZ+7yMy_wR{l4MJbAn(-XpU=`56_g?Dvr>c|w(v2< z1YLCSn~`R)VB$Y5oseLIHJ0!(Kp%CKP{dzKx};RqnOI?g4-C=7I|_KkV>yhk&X*bF T+!jW0Gt1A)yrP8iX#kvdsPuGAbAy!xYmELCxaZC+Yn zjwjrrg&SO>h`%H07av%ok2IbSr7;Y8=%S7qN+@EJlRmM8#cNJA4G95!T%Z6K-@LiP zJ7$>LA8(ei2dzn}@(}u$@WXx(hfxqm$$gXzl136Yy#E`$wNJ|XMm^edyKLV%JLW Date: Mon, 9 Dec 2019 18:45:09 +0700 Subject: [PATCH 5/6] Delete vim cache (sorry) --- 0.19/.Dockerfile.swp | Bin 16384 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 0.19/.Dockerfile.swp diff --git a/0.19/.Dockerfile.swp b/0.19/.Dockerfile.swp deleted file mode 100644 index fe3723dac189ab7b5636eac56e93cb14f113ab6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI3ON<;x8OIx&M*@T-a6mjHzKk93uI%of*RIEFHumo9*j{;Gnb|cCIN1HDndwYV z_oTaeAGS9@Y=S^=3j!&D6PzF+3F5>FiBkY65eeZT!6AnP1Q8?(9FTy2Rd>(MuGfxn zK#HOs=eILmUHw(nSKn8UuR3P_)XW@Jw1R@qZHn?-@s)co{XVyA>?uWYqYks$j%$bF z=G8x4!!mup(+m8o=Mi@v*c7PSY(@9OP%FEz+@ErIdxCkx)0-pfieZQh~z#rbHC=Y=K*aL0@ zw}QXFS5bZkehYpBehr=kKLB3?Uj?h+G`Jny2L5?7Q4NidyI0%NoK5#pD_1&lgcpO{?1&{|Xze`b`0$&7|!6on@ zI126p9|a!)ufJ1Ko(0cdiWl#Y{up8_Gzd-Qi=itYHgS$Zqd>q^aUPs@(2%ZJc zfXBe2;1MAD^-l2SK6_}=4VYoC6E`}{Bg0-XJZ`iY`Asre(+?P#>vXP*yJWSQ)j6jT z&HLmrW)t_RZLBcjZPq2n3%TLC%sxOyD3aEP@bC%?*2#2QH2lD5K2LK~BbuVrm*+`J zOrF_HQ19D2JiK?mzJHdn=g@GQnjezM$>EG=Itm&*xx% ztk;gsoZiSGi)fdoTfWzHS`ivQJAG_+@_1uHoz?vw*KM<`qoO)h7Z;NoGyNNmXStEh z^u8D);(m*HTG&>U+WaZnTHZuXKAF5(qi$B`RIT2aS(x9*#cB@GO{zoTc(@+wP0Qo1 z)*es4DGV%Bx7#zg)>ih=kt0WB8S8 z&VsI}8o9n@a0iXRe_>=JqA}Zw-zUy&t^T|o+uEtIq!wzx{mzq$kbp$ zX|JT;8g8L(#~8QTSLn&$WKh^+meX`BTADl_myUPRe9B3+J6?;X;tmlC2t{RwMV|?k zjEvJx_CDw&iIyfd^`%VKk5if~-b2&yCob3MbujSRLUdvssV$gB$b@Z3YmqJLw<*bD z%X@TODuM#m^Ft>#v$*$zE~!n*r2?<4x5kY?Yn{(Y$HQ+@*Un$p18MiyVjE975H+A& zYH&LY3rTTj_U5Q@ViG>vSe|QWMrhGR!f1ztFhZ3rQU@%njSjQ@RnPSe8|D++790g8 zZv=Re5K}-Krq9;kYc8e|cpk1rzZ-lggz@<+4jxRZ*lWR*VyoU(hiyd)87xE*j6$a+ z3|EZ)QatQ=#qpyMr8(W69|#xkFgUkxqSY4TluKiw)okw<8kH*$HF|gjv=SnWC0Rrm6@;#F;8M9k+Ue29AbpHYHh_Jblo-H+L1YE zv0uG@VR2d41A@rO?_aCQzeDT0XH5jwmMdFAER4fLaTBWD@N6pv?A9D zxr%*m^SEevI2;6Z{}Y(IZjFbTwiovJaO^jz$4u0GC$&UD2%HP4?wj;7Qhb(iwRL) zP7JY_rB>vvv`IvF$#-hK$aSgs$$f>mJ;HLZIwL%Ym6x#nSeO=>k;fx3Bx9KF^e{;G zDtWEv`>qyt!p%}c&0~DLl1DD%YPV@XZm-pgg^C|thilA^4nw1I3L=6+yUg(5t*EBK zIqUX#C^aY-gqW7j#acf{PDqwqC~C0OB`gmyKQ-k%AzBfSr~USXB>EWMZ8Fzi#oBYh zqoxytJe{~Gp4AMvmmD49V)9~{I@82V=l4W`p3k8sWDTMoq#cNtRKjNHU}3T}RTw*1 z8ZGBX^TpBWa`|Aba;$i;Tq)$I@`YllJXSq4IY#+HZF00+8Jn&ZDwCB;ak^YBj#bK| zhw{}*zHq2k8mks-hsMf^Qe9ZQ2Yo4KjS2A{v~IGX1Fu@Q&2igQ%UVS%<+b@L)&pW) zn0!GSu?HB*lH9}sgrni&eY+`FlfQ5j2g#c3~Z_UY8Fs^OO+43SdWxNO%wGwZ54_sR90PD>5K#FLet;*qG z^C`S=4xirI2(c8F`-RPHB1tT?6LIMjuBx7|rt5j(Bk58$yeQ@ac!TY#mhEYV+rv^w zYDbK-@~&9X#OYeg^)cLNP>0quLQHDHTQ0VSNQa^7C{6EA^$w<}WF@vNRtt+K<7EK( z!naQ>EiE=QYA`mw)2gZEVqy$j!wmK0UHP~Ix)X*G3-v+;<|IeYIDNdN74n0tRiQma zu5IF_>_j@Civ9l|u@8P0dt|ZyPtW(C#9sdi@E|w=j)RYZzhY1S6Yx#&4PXJW*B=H7 zcpUrr$H4c&_rOEI1s!k{904z3ufGOv1~-A%u*ZK6{1SW{d<%RDh*-chsDdKc2kr!~ zV1NHB@H}`FTn3lGJU9%-K@QvjM7tgap9Qyqf1$0fffvCGAp2w*$TW~?Ak#pmflLE$ zMGaK{tIymteI}=#uO{E!`+L#gZ!<7f2d)Qy#>EUgC-RzzfpsRhC6fvpzL<__YXsLeBB0|_p&}_QvmN!l> zE;MQ+)gk|uur>Mg+}$JsEg|A?*mokX>V*jRAlQNBFUj_YSon&l9!EgPT^~USu^^#V zDkOi)Wg)G;SdI5%O#{Kx;Vwd^SYRK(W-jFT0f~sViXT^%SdtRO-*UMOiHpTW97^z2 zKj_?mynH1uYE^42ZB}dRJ}!-3h{%lCv2P8>Z^+P6j^wF<2(P*_0Y^*=v&(Ze(gWY; zx|RsJ(SZI9ML5M)Y=`X;4kF@xoj5w-wzYph#al1l76(Gf1vYIyj!fb^Vnc^x1nljx zDL3U7Q2Ype+d<3_zu-190`qp*bj?mq)n;)@g{Xmu=LZwHX`|~PemBQput&R$#n&S^ zXxV9l)^rdBgiXb#2sj$Usf2JGaohqu+6ZfM2iDJJNK1xu@P9~?I*Y*1cH2T=h_CnX zJbth>W(`DYFKp16!yYikk@mOqBajGXPh6u4|1lYR9aY3Av zscw6Rl10E&#J9HB2%W8?h*`vD;4sO-pEQQ}3?dazMiW673VGo4u;FgS#mUPZqz;5< z?bwjSbJxzOu8LR^zwYdO?YgsCuJiv^58~LW)J9woP7AKowbTmptoGSt_}HmKL?$tK Irg@bA0NU~|(f|Me From da7028b3eb5748e692c22cdd71258c227fec1dec Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Mon, 9 Dec 2019 18:52:10 +0700 Subject: [PATCH 6/6] No need to clean up test/bench files, we only grab what we need for final image --- 0.19/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/0.19/Dockerfile b/0.19/Dockerfile index 62a8d0e..06ddac5 100644 --- a/0.19/Dockerfile +++ b/0.19/Dockerfile @@ -112,9 +112,6 @@ RUN ./configure LDFLAGS=-L/opt/db4/lib/ CPPFLAGS=-I/opt/db4/include/ \ RUN make -j$(($(nproc) + 1)) check RUN make install -# Already taken advantage of before by `make check`. No need to have them installed, as they're very big (~500 MB). -RUN rm ${BITCOIN_PREFIX}/bin/bench_bitcoin ${BITCOIN_PREFIX}/bin/test_bitcoin - # List installed libs, and binaries pre-strip RUN ls -lh ${BITCOIN_PREFIX}/bin/ ${BITCOIN_PREFIX}/lib/