From 6244efdaf2115ff82b78dd774b42b6c34bc1e66c Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:51:40 -0700 Subject: [PATCH 01/13] Update Dockerfile Update to latest Ubuntu --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 10d83bf..2d77894 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:latest LABEL maintainer="Pedro Lobo " LABEL Name="Dockerized xmr-node-proxy" LABEL Version="1.4" @@ -36,4 +36,4 @@ RUN export BUILD_DEPS="cmake \ USER proxy WORKDIR /app -ENTRYPOINT ["node","proxy.js"] \ No newline at end of file +ENTRYPOINT ["node","proxy.js"] From 8f3b552f4c9c466e6e8ad5595cd7cbe2a535922d Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:52:30 -0700 Subject: [PATCH 02/13] Update Dockerfile Fix empty continuation --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d77894..3b55b73 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,16 +17,12 @@ RUN export BUILD_DEPS="cmake \ libunbound-dev libminiupnpc-dev \ libunwind8-dev liblzma-dev libldns-dev \ libexpat1-dev libgtest-dev libzmq3-dev \ - && curl -o- https://deb.nodesource.com/setup_6.x| bash \ && apt-get install nodejs \ - && git clone https://github.com/Snipa22/xmr-node-proxy /app \ && cd /app && npm install \ - && openssl req -subj "/C=IT/ST=Pool/L=Daemon/O=Mining Pool/CN=mining.proxy" \ -newkey rsa:2048 -nodes -keyout cert.key -x509 -out cert.pem -days 36500 \ - && apt-get --auto-remove purge -qqy ${BUILD_DEPS} \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ From a5117219b720b3a6b7365fba59b7552becf82760 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:53:07 -0700 Subject: [PATCH 03/13] Update Dockerfile Add python3-virtualenv, fixes E: Package 'python-virtualenv' has no installation candidate --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b55b73..055a5b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN export BUILD_DEPS="cmake \ && apt-get update && apt-get upgrade -qqy \ && apt-get install --no-install-recommends -qqy \ - ${BUILD_DEPS} python-virtualenv \ + ${BUILD_DEPS} python3-virtualenv \ python3-virtualenv ntp screen \ libboost-all-dev libevent-dev \ libunbound-dev libminiupnpc-dev \ From c2ed0feb5eb98808015e14623ab303d8164114ac Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:53:32 -0700 Subject: [PATCH 04/13] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 055a5b0..cc603c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ RUN export BUILD_DEPS="cmake \ git \ build-essential \ curl" \ - && apt-get update && apt-get upgrade -qqy \ && apt-get install --no-install-recommends -qqy \ ${BUILD_DEPS} python3-virtualenv \ From 5549f65e14ce1038da7277d0323125c7a5bb8985 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:54:26 -0700 Subject: [PATCH 05/13] Update README.md Use Ubuntu 20.04 LTS --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a390fe1..ef0c03c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Setup Instructions -Based on a clean Ubuntu 16.04 LTS minimal install +Based on a clean Ubuntu 20.04 LTS minimal install ## Deployment via Installer From 97cb47151c57b4d86f3edcef9c42d09f12f3f6da Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:55:07 -0700 Subject: [PATCH 06/13] Update README.md Update old 16.04 references to 20.04 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ef0c03c..9112728 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ pm2 monit VMs with 512Mb or less RAM will need some swap space in order to compile the C extensions for node. Bignum and the CN libraries can chew through some serious memory during compile. In regards to this, one of our users has put together a guide for T2.Micro servers: https://docs.google.com/document/d/1m8E4_pDwKuFo0TnWJaO13LDHqOmbL6YrzyR6FvzqGgU (Credit goes to MayDay30 for his work with this!) -If not running on an Ubuntu 16.04 system, please make sure your kernel is at least 3.2 or higher, as older versions will not work for this. +If not running on an Ubuntu 20.04 system, please make sure your kernel is at least 3.2 or higher, as older versions will not work for this. Many smaller VMs come with ulimits set very low. We suggest looking into setting the ulimit higher. In particular, `nofile` (Number of files open) needs to be raised for high-usage instances. @@ -82,7 +82,7 @@ The proxy is pre-configured for a 1% donation. This is easily toggled inside of ## Installation/Configuration Assistance -If you need help installing the pool from scratch, please have your servers ready, which would be Ubuntu 16.04 servers, blank and clean, DNS records pointed. These need to be x86_64 boxes with AES-NI Available. +If you need help installing the pool from scratch, please have your servers ready, which would be Ubuntu 20.04 servers, blank and clean, DNS records pointed. These need to be x86_64 boxes with AES-NI Available. Installation asstiance is 4 XMR, with a 2 XMR deposit, with remainder to be paid on completion. Configuration assistance is 2 XMR with a 1 XMR deposit, and includes debugging your proxy configurations, ensuring that everything is running, and tuning for your uses/needs. From fd3e411afd89a1f8d24040616cb75bd7abcaadc3 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:56:28 -0700 Subject: [PATCH 07/13] Update README.md Remove dead pools --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 9112728..977764a 100644 --- a/README.md +++ b/README.md @@ -96,16 +96,8 @@ Please contact Snipa at: proxy_installs@snipanet.com or via IRC on irc.freenode. * [XMRPool.net](https://xmrpool.net) * [supportXMR.com](https://supportxmr.com) * [pool.xmr.pt](https://pool.xmr.pt) -* [minemonero.pro](https://minemonero.pro) -* [XMRPool.xyz](https://xmrpool.xyz) -* [ViaXMR.com](https://viaxmr.com) -* [mine.MoneroPRO.com](https://mine.moneropro.com) * [MinerCircle.com](https://www.minercircle.com) -* [xmr.p00ls.net](https://www.p00ls.net) -* [MoriaXMR.com](https://moriaxmr.com) * [MoneroOcean.stream](https://moneroocean.stream) -* [SECUmine.net](https://secumine.net) -* [Chinaenter.cn](http://xmr.chinaenter.cn) * [XMRPool.eu](https://xmrpool.eu) If you'd like to have your pool added, please make a pull request here, or contact Snipa on IRC! From d31c56b56c3ae3289a16681cc7dc4144a982e5e8 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 14:58:08 -0700 Subject: [PATCH 08/13] Update Dockerfile TZData fix during build --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc603c3..a374f93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM ubuntu:latest +FROM ubuntu:20.04 LABEL maintainer="Pedro Lobo " LABEL Name="Dockerized xmr-node-proxy" LABEL Version="1.4" - +RUN apt-get update +RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata RUN export BUILD_DEPS="cmake \ pkg-config \ git \ @@ -27,8 +28,6 @@ RUN export BUILD_DEPS="cmake \ && rm -rf /var/lib/apt/lists/* \ && chown -R proxy.proxy /app \ && mkdir /logs && chown -R proxy.proxy /logs - USER proxy WORKDIR /app - ENTRYPOINT ["node","proxy.js"] From 02f7abfdef8195a829f60919ef2014931b74c090 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 15:05:03 -0700 Subject: [PATCH 09/13] Update Dockerfile Nodejs to 12! --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a374f93..e794126 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN export BUILD_DEPS="cmake \ libunbound-dev libminiupnpc-dev \ libunwind8-dev liblzma-dev libldns-dev \ libexpat1-dev libgtest-dev libzmq3-dev \ - && curl -o- https://deb.nodesource.com/setup_6.x| bash \ + && curl -o- https://deb.nodesource.com/setup_12.x| bash \ && apt-get install nodejs \ && git clone https://github.com/Snipa22/xmr-node-proxy /app \ && cd /app && npm install \ From 371bc1b1777c6317e55f9c4ab8ad487a28599d3b Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 15:32:39 -0700 Subject: [PATCH 10/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 936aa1f..5645419 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/snipa22/xmr-node-proxy#readme", "dependencies": { "async": "2.1.4", - "bignum": "^0.12.5", + "bignum": "^0.13.0", "body-parser": "^1.16.0", "circular-buffer": "1.0.2", "cluster": "0.7.7", From c9e9284a154299a47a8792bdaf34e58ed3d7d67d Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 15:42:37 -0700 Subject: [PATCH 11/13] Update package.json Use 0.13.1 for bignum --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5645419..8c88b38 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/snipa22/xmr-node-proxy#readme", "dependencies": { "async": "2.1.4", - "bignum": "^0.13.0", + "bignum": "0.13.1", "body-parser": "^1.16.0", "circular-buffer": "1.0.2", "cluster": "0.7.7", From 217f9ca19d6a67c9eecefdaf752df7fca26893d0 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 15:49:00 -0700 Subject: [PATCH 12/13] Update package.json Confirmed working! --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8c88b38..d020ddc 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "homepage": "https://github.com/snipa22/xmr-node-proxy#readme", "dependencies": { "async": "2.1.4", - "bignum": "0.13.1", + "bignum": "^0.13.1", "body-parser": "^1.16.0", "circular-buffer": "1.0.2", "cluster": "0.7.7", From f239714a88b400bc3a98c1b910f9a94533087869 Mon Sep 17 00:00:00 2001 From: 88plug <19512127+88plug@users.noreply.github.com> Date: Sat, 22 Aug 2020 15:55:46 -0700 Subject: [PATCH 13/13] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e794126..ba509e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN export BUILD_DEPS="cmake \ libexpat1-dev libgtest-dev libzmq3-dev \ && curl -o- https://deb.nodesource.com/setup_12.x| bash \ && apt-get install nodejs \ - && git clone https://github.com/Snipa22/xmr-node-proxy /app \ + && git clone https://github.com/cryptoandcoffee/xmr-node-proxy /app \ && cd /app && npm install \ && openssl req -subj "/C=IT/ST=Pool/L=Daemon/O=Mining Pool/CN=mining.proxy" \ -newkey rsa:2048 -nodes -keyout cert.key -x509 -out cert.pem -days 36500 \