Skip to content

Commit

Permalink
Merge pull request #55 from AvadoDServer/0.1.83
Browse files Browse the repository at this point in the history
0.1.83
  • Loading branch information
sponnet authored Nov 18, 2023
2 parents 6f6bc1b + bbb6d73 commit f97005e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 25 deletions.
25 changes: 5 additions & 20 deletions build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:16-buster as build-deps-wallet

RUN apt-get update && apt-get install -y openssl

Expand All @@ -33,9 +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
Expand All @@ -51,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
Expand All @@ -76,15 +65,11 @@ 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

RUN useradd nginx

ENTRYPOINT supervisord -n -c /etc/supervisord/supervisord.conf


2 changes: 1 addition & 1 deletion build/files/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dappnode_package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit f97005e

Please sign in to comment.