diff --git a/README.md b/README.md index a75ebb5..603bb35 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Codex Dappnode package +# Codex Dappnode packages

Codex Dappnode package @@ -29,10 +29,15 @@ # Directory cd DAppNodePackage-codex - # Build all packages ~ 10 minutes + # Build all packages (~ 10 minutes) - use your IPFS package Container IP npx @dappnode/dappnodesdk build --all-variants --provider=http://172.33.0.6:5001 ``` + | Package | Link | + | --------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ | + | Codex | [`/ipfs/QmQjh7iCM97U7rAzALsJz7brwLttrwYirG6EKYhRAA3qys`](http://my.dappnode/installer/public/%2Fipfs%2FQmQjh7iCM97U7rAzALsJz7brwLttrwYirG6EKYhRAA3qys) | + | Codex with local Geth | [`/ipfs/Qmdpnv5Kev3moyobAKbKhU7of1DywJ5VEDKd3f2ti199tB`](http://my.dappnode/installer/public/%2Fipfs%2FQmdpnv5Kev3moyobAKbKhU7of1DywJ5VEDKd3f2ti199tB) | + ## Todo diff --git a/codex-node/docker-entrypoint.sh b/codex-node/docker-entrypoint.sh index 24b6d73..d21320f 100644 --- a/codex-node/docker-entrypoint.sh +++ b/codex-node/docker-entrypoint.sh @@ -12,7 +12,7 @@ fi # Parameters if [[ -z "${CODEX_NAT}" ]]; then if [[ "${NAT_IP_AUTO}" == "true" && -z "${NAT_PUBLIC_IP_AUTO}" ]]; then - export CODEX_NAT=$(hostname --ip-address) + export CODEX_NAT="extip:$(hostname --ip-address)" echo "Private: CODEX_NAT=${CODEX_NAT}" elif [[ -n "${NAT_PUBLIC_IP_AUTO}" ]]; then # Run for 60 seconds if fail @@ -20,9 +20,10 @@ if [[ -z "${CODEX_NAT}" ]]; then SECONDS=0 SLEEP=5 while (( SECONDS < WAIT )); do - export CODEX_NAT=$(curl -s -f -m 5 "${NAT_PUBLIC_IP_AUTO}") + IP=$(curl -s -f -m 5 "${NAT_PUBLIC_IP_AUTO}") # Check if exit code is 0 and returned value is not empty - if [[ $? -eq 0 && -n "${CODEX_NAT}" ]]; then + if [[ $? -eq 0 && -n "${IP}" ]]; then + export CODEX_NAT="extip:${IP}" echo "Public: CODEX_NAT=${CODEX_NAT}" break else diff --git a/dappnode_package.json b/dappnode_package.json index 14b5c42..b5ab9da 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -2,7 +2,7 @@ "upstream": [ { "repo": "codex-storage/nim-codex", - "version": "0.1.9", + "version": "0.2.0", "arg": "UPSTREAM_VERSION_CODEX_NODE" }, { diff --git a/docker-compose.yml b/docker-compose.yml index 13716ff..fbfca49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: context: ./codex-node dockerfile: Dockerfile args: - UPSTREAM_VERSION_CODEX_NODE: 0.1.9 + UPSTREAM_VERSION_CODEX_NODE: 0.2.0 image: codex-node.public.dappnode.eth:0.1.0 restart: unless-stopped environment: diff --git a/setup-wizard.yml b/setup-wizard.yml index ba8569f..906bced 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -25,7 +25,7 @@ fields: service: [codex-node, geth] title: Codex network description: >- - - **`Testnet`** - Codex Testnet network. Please check the [docs](https://docs.codex.storage/networks/networks) for available networks. + - **`Testnet`** - Codex Testnet network. Check the [docs](https://docs.codex.storage/networks/networks) for available networks. enum: - testnet required: true @@ -68,7 +68,7 @@ fields: description: >- Address of deployed Marketplace contract. - We should set this variable **only if we would like to override auto-detected address**. Please check the address for the network you are using in the [docs](https://docs.codex.storage/networks/networks). + We should set this variable **only if we would like to override auto-detected address**. Check the address for the network you are using in the [docs](https://docs.codex.storage/networks/networks). pattern: "^0x[a-fA-F0-9]{40}$" patternErrorMessage: Must be a valid Ethereum address required: false @@ -83,7 +83,7 @@ fields: description: >- Address of deployed Marketplace contract. - We should set this variable because we are running in **Codex `storage node`** mode. Please check the address for the network you are using in the [docs](https://docs.codex.storage/networks/networks). + We should set this variable because we are running in **Codex `storage node`** mode. Check the address for the network you are using in the [docs](https://docs.codex.storage/networks/networks). pattern: "^0x[a-fA-F0-9]{40}$" patternErrorMessage: Must be a valid Ethereum address required: true @@ -109,8 +109,8 @@ fields: service: codex-node title: CODEX_NAT description: >- - Public IP address to announce behind a NAT. - pattern: "^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0)$" + Specify method to use for determining public address. Must be one of: `any`, `none`, `upnp`, `pmp`, `extip:`, default = `any`. Check the [docs](https://docs.codex.storage/learn/run#nat-configuration) for more details. + pattern: "^(any|none|upnp|pmp|extip:((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0).){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]?|0))$" patternErrorMessage: Must be a valid IP address required: true if: { "IP_MODE": { "enum": ["manual"] } } @@ -209,7 +209,7 @@ fields: service: codex-node title: EXTRA_OPTS description: >- - Extra options to pass to the Codex node. Check [Codex CLI options](https://docs.codex.storage/learn/run#cli-options) for more details. + Extra options to pass to the Codex node. Check the [docs](https://docs.codex.storage/learn/run#cli-options) for more details. pattern: "^.*$" patternErrorMessage: Must be a valid string required: false