From 488d2f429e341475bd5b176b84a253a2ebcac1de Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:08:50 -0500 Subject: [PATCH 1/8] Add bitcoin dependencies. --- Dockerfile | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 25ea3af5..308f2077 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,6 +29,30 @@ RUN \ libxkbfile-dev \ pkg-config \ python3 && \ + libtool-bin && \ + autotools-dev && \ + automake && \ + bsdmainutils && \ + libdb-dev && \ + libminiupnpc-dev && \ + libzmq3-dev && \ + libdb++-dev && \ + make && \ + cmake && \ + g++-multilib && \ + binutils-gold && \ + patch && \ + libevent-dev && \ + libboost-system-dev && \ + libboost-filesystem-dev && \ + libboost-test-dev && \ + libboost-thread-dev && \ + libqt5gui5 && \ + libqt5core5a && \ + libqt5dbus5 && \ + qttools5-dev && \ + qttools5-dev-tools && \ + libqrencode-dev && \ echo "**** install runtime dependencies ****" && \ apt-get install -y \ git \ @@ -50,7 +74,6 @@ RUN \ yarn cache clean && \ echo "**** clean up ****" && \ apt-get purge --auto-remove -y \ - build-essential \ libx11-dev \ libxkbfile-dev \ libsecret-1-dev \ From 24cc8acdcdec64328cf35dbfbffe7f6f438a13df Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:17:25 -0500 Subject: [PATCH 2/8] wip --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 308f2077..e34caa01 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN \ libxkbfile-dev \ pkg-config \ python3 && \ - libtool-bin && \ autotools-dev && \ automake && \ bsdmainutils && \ From eea869da8fbaaac6bab4198eae184c606873d407 Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:21:08 -0500 Subject: [PATCH 3/8] wip --- Dockerfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e34caa01..13084844 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN \ libxkbfile-dev \ pkg-config \ python3 && \ - autotools-dev && \ automake && \ bsdmainutils && \ libdb-dev && \ @@ -84,6 +83,24 @@ RUN \ /var/lib/apt/lists/* \ /var/tmp/* +RUN wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && \ + tar xf autoconf* && \ + cd autoconf-2.69 && \ + sh configure --prefix /usr/local && \ + make install + +RUN wget http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz && \ + tar xf automake* && \ + cd automake-1.15 && \ + sh configure --prefix/usr/local && \ + make install + +RUN wget http://mirror.jre655.com/GNU/libtool/libtool-2.4.6.tar.gz && \ + tar xf libtool* && \ + cd libtool-2.4.6 && \ + sh configure --prefix /usr/local && \ + make install + # add local files COPY /root / From c36acde7de08beb5d7cbba9dde654953ac300fe9 Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:22:26 -0500 Subject: [PATCH 4/8] wip --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 13084844..80c44997 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN \ libxkbfile-dev \ pkg-config \ python3 && \ - automake && \ bsdmainutils && \ libdb-dev && \ libminiupnpc-dev && \ From 15d45340634e1ea7794abe99a28d74fab8d7684e Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:29:12 -0500 Subject: [PATCH 5/8] wip --- Dockerfile | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 80c44997..bdc7049d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,14 +22,21 @@ RUN \ echo 'deb https://dl.yarnpkg.com/debian/ stable main' \ > /etc/apt/sources.list.d/yarn.list && \ echo "**** install build dependencies ****" && \ - apt-get update && \ - apt-get install -y \ + apt-get update + +RUN apt-get install -y software-properties-common + +RUN apt-get update && \ + apt-get install -y \ build-essential \ libx11-dev \ libxkbfile-dev \ pkg-config \ python3 && \ bsdmainutils && \ + autoconf && \ + automake && \ + libtool && \ libdb-dev && \ libminiupnpc-dev && \ libzmq3-dev && \ @@ -82,24 +89,6 @@ RUN \ /var/lib/apt/lists/* \ /var/tmp/* -RUN wget http://ftp.gnu.org/gnu/autoconf/autoconf-2.69.tar.gz && \ - tar xf autoconf* && \ - cd autoconf-2.69 && \ - sh configure --prefix /usr/local && \ - make install - -RUN wget http://ftp.gnu.org/gnu/automake/automake-1.15.tar.gz && \ - tar xf automake* && \ - cd automake-1.15 && \ - sh configure --prefix/usr/local && \ - make install - -RUN wget http://mirror.jre655.com/GNU/libtool/libtool-2.4.6.tar.gz && \ - tar xf libtool* && \ - cd libtool-2.4.6 && \ - sh configure --prefix /usr/local && \ - make install - # add local files COPY /root / From 325821386522a26d434bab77842b3703e2949ea9 Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:37:57 -0500 Subject: [PATCH 6/8] wip --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdc7049d..b0d94b8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-ubuntu:latest # set version label ARG BUILD_DATE @@ -27,7 +27,7 @@ RUN \ RUN apt-get install -y software-properties-common RUN apt-get update && \ - apt-get install -y \ + apt-get install -qq -y \ build-essential \ libx11-dev \ libxkbfile-dev \ From f84a4cd5e86e845fcce8f8d15c7cba64b965bf49 Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:38:31 -0500 Subject: [PATCH 7/8] wip --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b0d94b8c..96a250da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:latest +FROM ghcr.io/linuxserver/baseimage-ubuntu:focal # set version label ARG BUILD_DATE @@ -33,7 +33,7 @@ RUN apt-get update && \ libxkbfile-dev \ pkg-config \ python3 && \ - bsdmainutils && \ + # bsdmainutils && \ autoconf && \ automake && \ libtool && \ From 17bcb8efaa6404117ecfe26ce0d76c2156067d83 Mon Sep 17 00:00:00 2001 From: Ryan Hein Date: Mon, 3 Jan 2022 16:39:14 -0500 Subject: [PATCH 8/8] wip --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96a250da..dc2778ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,9 +34,9 @@ RUN apt-get update && \ pkg-config \ python3 && \ # bsdmainutils && \ - autoconf && \ - automake && \ - libtool && \ + # autoconf && \ + # automake && \ + # libtool && \ libdb-dev && \ libminiupnpc-dev && \ libzmq3-dev && \