From b6b31a6bce6dd8d19f89aacbb85445c61a30835f Mon Sep 17 00:00:00 2001 From: sponnet Date: Fri, 17 Nov 2023 13:36:09 +0100 Subject: [PATCH 1/6] bump avalanche version --- dappnode_package.json | 4 ++-- docker-compose.yml | 4 ++-- releases.json | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index c846115..cd3e12f 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,7 +1,7 @@ { "name": "avalanchego.avado.dnp.dappnode.eth", - "version": "0.1.82", - "upstream": "v1.10.0", + "version": "0.1.83", + "upstream": "v1.10.15", "title": "Avalanche node", "description": "This is the Avalanche Mainnet node. Avalanche is an open-source platform for launching highly decentralized applications, new financial primitives, and new interoperable blockchains.", "avatar": "/ipfs/QmVwkdxaKfTiv6apuHjVP2ftzPahpcmwHpBNNdKp8QzZPn", diff --git a/docker-compose.yml b/docker-compose.yml index 1707486..9c30aff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,11 @@ version: '3.4' services: avalanchego.avado.dnp.dappnode.eth: - image: 'avalanchego.avado.dnp.dappnode.eth:0.1.82' + image: 'avalanchego.avado.dnp.dappnode.eth:0.1.83' build: context: ./build args: - - VERSION=v1.10.0 + - VERSION=v1.10.15 environment: - EXTRA_OPTS=--dynamic-public-ip=opendns volumes: diff --git a/releases.json b/releases.json index af0e958..680bb18 100644 --- a/releases.json +++ b/releases.json @@ -452,5 +452,12 @@ "uploadedTo": { "http://80.208.229.228:5001": "Fri, 24 Mar 2023 10:43:38 GMT" } + }, + "0.1.82": { + "hash": "/ipfs/QmZ1VTs2NyUB7QcpuP4NpY2Yt7oQv29Y26xtdBzhVANJmc", + "type": "manifest", + "uploadedTo": { + "dappnode": "Tue, 25 Apr 2023 11:12:42 GMT" + } } } \ No newline at end of file From a14172a466d9e606d5f50cfb6fa4b10a8f15107c Mon Sep 17 00:00:00 2001 From: sponnet Date: Fri, 17 Nov 2023 15:03:32 +0100 Subject: [PATCH 2/6] change nodeJS version to v17 for frontend build --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index bbfea7f..b50ffa8 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -10,7 +10,7 @@ RUN mv avalanchego-$VERSION/* /app RUN echo "contents of /app in builder" #RUN ls -l /app -FROM --platform=linux/amd64 node:15.14.0-buster as build-deps-wizard +FROM --platform=linux/amd64 node:17-buster as build-deps-wizard RUN apt-get update && apt-get install -y openssl From 9b51a39ef030fb6ec9c6223356b2b977c43a6158 Mon Sep 17 00:00:00 2001 From: sponnet Date: Fri, 17 Nov 2023 15:19:07 +0100 Subject: [PATCH 3/6] node v16 --- build/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index b50ffa8..322ad76 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -10,7 +10,7 @@ RUN mv avalanchego-$VERSION/* /app RUN echo "contents of /app in builder" #RUN ls -l /app -FROM --platform=linux/amd64 node:17-buster as build-deps-wizard +FROM --platform=linux/amd64 node:16-buster as build-deps-wizard RUN apt-get update && apt-get install -y openssl @@ -34,6 +34,7 @@ RUN git apply wallet.patch RUN cat src/store/modules/network/network.ts RUN NODE_OPTIONS=--max_old_space_size=4096 yarn build +RUN yarn build #RUN ls -l /usr/src/app/wallet/avalanche-wallet/dist From d1558ce92cb8c639914dd5bce18cb7bd19669b6a Mon Sep 17 00:00:00 2001 From: sponnet Date: Fri, 17 Nov 2023 15:36:37 +0100 Subject: [PATCH 4/6] remove double build --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 322ad76..08ac710 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -33,7 +33,7 @@ RUN git apply wallet.patch RUN cat src/store/modules/network/network.ts -RUN NODE_OPTIONS=--max_old_space_size=4096 yarn build +#RUN NODE_OPTIONS=--max_old_space_size=4096 yarn build RUN yarn build #RUN ls -l /usr/src/app/wallet/avalanche-wallet/dist From eec1a79a2fecf539427fe82d0a2b129de86a73e8 Mon Sep 17 00:00:00 2001 From: sponnet Date: Fri, 17 Nov 2023 16:26:08 +0100 Subject: [PATCH 5/6] fix builds --- build/Dockerfile | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 08ac710..75fc7de 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -10,7 +10,7 @@ RUN mv avalanchego-$VERSION/* /app RUN echo "contents of /app in builder" #RUN ls -l /app -FROM --platform=linux/amd64 node:16-buster as build-deps-wizard +FROM --platform=linux/amd64 node:16-buster as build-deps-wallet RUN apt-get update && apt-get install -y openssl @@ -33,10 +33,9 @@ RUN git apply wallet.patch RUN cat src/store/modules/network/network.ts -#RUN NODE_OPTIONS=--max_old_space_size=4096 yarn build RUN yarn build -#RUN ls -l /usr/src/app/wallet/avalanche-wallet/dist +FROM --platform=linux/amd64 node:15.14.0-buster as build-deps-wizard # build wallet UI WORKDIR /usr/src/app/wizard @@ -52,20 +51,9 @@ USER root # Copy wallet UI COPY --from=builder /app /usr/local/app -COPY --from=build-deps-wizard /usr/src/app/wallet/avalanche-wallet/dist /usr/local/wallet +COPY --from=build-deps-wallet /usr/src/app/wallet/avalanche-wallet/dist /usr/local/wallet COPY --from=build-deps-wizard /usr/src/app/wizard/build /usr/local/wizard -# RUN echo "contents of /usr/local/ in target" -# RUN ls -l /usr/local/ -# RUN echo "contents of /usr/local/wizard in target" -# RUN ls -l /usr/local/wizard -# # RUN echo "contents of /usr/local/wallet in target " -# # RUN ls -l /usr/local/wallet -# RUN echo "-------------" - - -#RUN echo "contents of /usr/local/app in target" -#RUN ls -l /usr/local/app RUN chmod +x /usr/local/app/avalanchego RUN apt-get update @@ -77,9 +65,7 @@ COPY files/dlcerts.sh /bin/dlcerts RUN chmod +x /bin/dlcerts COPY files/nginx.conf /etc/nginx/ RUN mkdir -p /etc/nginx/certs/ -COPY --from=build-deps-wizard /etc/nginx/certs/* /etc/nginx/certs/ -# RUN ls -l /etc/nginx/certs -# RUN cat /etc/nginx/nginx.conf +COPY --from=build-deps-wallet /etc/nginx/certs/* /etc/nginx/certs/ # copy config files COPY files/config /config @@ -87,5 +73,3 @@ COPY files/config /config RUN useradd nginx ENTRYPOINT supervisord -n -c /etc/supervisord/supervisord.conf - - From bbb6d737b40f5593d067ed8fd1529a6ff1d57049 Mon Sep 17 00:00:00 2001 From: sponnet Date: Fri, 17 Nov 2023 17:15:05 +0100 Subject: [PATCH 6/6] added allowed hosts --- build/files/supervisord.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/files/supervisord.conf b/build/files/supervisord.conf index 55ea4a3..f470b56 100644 --- a/build/files/supervisord.conf +++ b/build/files/supervisord.conf @@ -30,7 +30,7 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:main] -command=/usr/local/app/avalanchego --network-peer-list-num-validator-ips=10 --network-peer-list-validator-gossip-size=10 --network-peer-list-non-validator-gossip-size=10 --http-host=0.0.0.0 --http-tls-enabled=true --http-tls-cert-file=/etc/nginx/certs/my.ava.do.crt --http-tls-key-file=/etc/nginx/certs/my.ava.do.key --public-ip-resolution-service=opendns --chain-config-dir=/config +command=/usr/local/app/avalanchego --network-peer-list-num-validator-ips=10 --network-peer-list-validator-gossip-size=10 --network-peer-list-non-validator-gossip-size=10 --http-host=0.0.0.0 --http-tls-enabled=true --http-tls-cert-file=/etc/nginx/certs/my.ava.do.crt --http-tls-key-file=/etc/nginx/certs/my.ava.do.key --public-ip-resolution-service=opendns --chain-config-dir=/config --http-allowed-hosts="*" autostart=false autorestart=true stdout_logfile=/dev/fd/1