From 2ae0ca17abfc69f74938bda05d2decfee8762b02 Mon Sep 17 00:00:00 2001 From: "Andres D. Molins" Date: Thu, 26 Jun 2025 13:24:49 +0200 Subject: [PATCH 1/2] Feature: Increase Docker image version to last stable and replace docs by the last version tag. --- deployment/docker-build/dev/docker-compose.yml | 4 ++-- deployment/docker-build/dev/kubo.json | 15 ++++++++++++--- deployment/docker-build/kubo.json | 15 ++++++++++++--- deployment/docker-build/test/kubo.json | 15 ++++++++++++--- .../samples/docker-compose/docker-compose.yml | 4 ++-- deployment/samples/docker-compose/kubo.json | 15 ++++++++++++--- docs/conf.py | 2 +- docs/guides/install.rst | 2 +- 8 files changed, 54 insertions(+), 18 deletions(-) diff --git a/deployment/docker-build/dev/docker-compose.yml b/deployment/docker-build/dev/docker-compose.yml index 4604c2b06..fe7d8df0a 100644 --- a/deployment/docker-build/dev/docker-compose.yml +++ b/deployment/docker-build/dev/docker-compose.yml @@ -10,7 +10,7 @@ services: pyaleph: # platform: linux/amd64 restart: always - # image: alephim/pyaleph-node:0.5.8 + # image: alephim/pyaleph-node:0.8.0 image: localhost/alephim/pyaleph-node-dev:build build: dockerfile: ./deployment/docker-build/dev/Dockerfile @@ -35,7 +35,7 @@ services: pyaleph-api: # platform: linux/amd64 restart: always - # image: alephim/pyaleph-node:0.5.8 + # image: alephim/pyaleph-node:0.8.0 image: localhost/alephim/pyaleph-node:build build: dockerfile: ./deployment/docker-build/dev/Dockerfile diff --git a/deployment/docker-build/dev/kubo.json b/deployment/docker-build/dev/kubo.json index 182c607ff..b7edff10a 100644 --- a/deployment/docker-build/dev/kubo.json +++ b/deployment/docker-build/dev/kubo.json @@ -6,16 +6,25 @@ "Strategy": "pinned" }, "Routing": { - "Type": "dhtclient", - "AcceleratedDHTClient": true + "Type": "dhtserver" }, + "Bootstrap": [ + "/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di", + "/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN", + "/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ" + ], "Datastore": { + "StorageMax": "1500GB", "GCPeriod": "12h" }, "Swarm": { "EnableHolePunching":true, "RelayService": { "Enabled": false - } + }, + "AddrFilters": [ + "/ip4/86.84.0.0/ipcidr/16" + ] } } diff --git a/deployment/docker-build/kubo.json b/deployment/docker-build/kubo.json index 182c607ff..b7edff10a 100644 --- a/deployment/docker-build/kubo.json +++ b/deployment/docker-build/kubo.json @@ -6,16 +6,25 @@ "Strategy": "pinned" }, "Routing": { - "Type": "dhtclient", - "AcceleratedDHTClient": true + "Type": "dhtserver" }, + "Bootstrap": [ + "/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di", + "/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN", + "/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ" + ], "Datastore": { + "StorageMax": "1500GB", "GCPeriod": "12h" }, "Swarm": { "EnableHolePunching":true, "RelayService": { "Enabled": false - } + }, + "AddrFilters": [ + "/ip4/86.84.0.0/ipcidr/16" + ] } } diff --git a/deployment/docker-build/test/kubo.json b/deployment/docker-build/test/kubo.json index 182c607ff..b7edff10a 100644 --- a/deployment/docker-build/test/kubo.json +++ b/deployment/docker-build/test/kubo.json @@ -6,16 +6,25 @@ "Strategy": "pinned" }, "Routing": { - "Type": "dhtclient", - "AcceleratedDHTClient": true + "Type": "dhtserver" }, + "Bootstrap": [ + "/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di", + "/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN", + "/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ" + ], "Datastore": { + "StorageMax": "1500GB", "GCPeriod": "12h" }, "Swarm": { "EnableHolePunching":true, "RelayService": { "Enabled": false - } + }, + "AddrFilters": [ + "/ip4/86.84.0.0/ipcidr/16" + ] } } diff --git a/deployment/samples/docker-compose/docker-compose.yml b/deployment/samples/docker-compose/docker-compose.yml index 724b13324..df24b7010 100644 --- a/deployment/samples/docker-compose/docker-compose.yml +++ b/deployment/samples/docker-compose/docker-compose.yml @@ -11,7 +11,7 @@ volumes: services: pyaleph: restart: always - image: alephim/pyaleph-node:0.7.4 + image: alephim/pyaleph-node:0.8.0 command: --config /opt/pyaleph/config.yml --key-dir /opt/pyaleph/keys -v volumes: - ./config.yml:/opt/pyaleph/config.yml @@ -30,7 +30,7 @@ services: pyaleph-api: restart: always - image: alephim/pyaleph-node:0.7.4 + image: alephim/pyaleph-node:0.8.0 command: --config /opt/pyaleph/config.yml --key-dir /opt/pyaleph/keys -v entrypoint: ["bash", "deployment/scripts/run_aleph_ccn_api.sh"] ports: diff --git a/deployment/samples/docker-compose/kubo.json b/deployment/samples/docker-compose/kubo.json index 182c607ff..b7edff10a 100644 --- a/deployment/samples/docker-compose/kubo.json +++ b/deployment/samples/docker-compose/kubo.json @@ -6,16 +6,25 @@ "Strategy": "pinned" }, "Routing": { - "Type": "dhtclient", - "AcceleratedDHTClient": true + "Type": "dhtserver" }, + "Bootstrap": [ + "/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di", + "/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN", + "/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ" + ], "Datastore": { + "StorageMax": "1500GB", "GCPeriod": "12h" }, "Swarm": { "EnableHolePunching":true, "RelayService": { "Enabled": false - } + }, + "AddrFilters": [ + "/ip4/86.84.0.0/ipcidr/16" + ] } } diff --git a/docs/conf.py b/docs/conf.py index 730419741..025bbfb48 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -293,5 +293,5 @@ rst_epilog = """ -.. |pyaleph_version| replace:: 0.7.4 +.. |pyaleph_version| replace:: 0.8.0 """ diff --git a/docs/guides/install.rst b/docs/guides/install.rst index 35c66bf52..1be931eef 100644 --- a/docs/guides/install.rst +++ b/docs/guides/install.rst @@ -120,7 +120,7 @@ Download the Docker Compose file that defines how to run PyAleph and IPFS togeth .. parsed-literal:: - wget "https://raw.githubusercontent.com/aleph-im/pyaleph/main/deployment/samples/docker-compose/docker-compose.yml" + wget "https://raw.githubusercontent.com/aleph-im/pyaleph/|pyaleph_version|/deployment/samples/docker-compose/docker-compose.yml" At this stage, you will need your configuration file and your keys. Check the configuration section to see how you can generate them. From fd447a6fd7073d064f7bb80326573c87e9c9f0c1 Mon Sep 17 00:00:00 2001 From: "Andres D. Molins" Date: Thu, 26 Jun 2025 13:52:23 +0200 Subject: [PATCH 2/2] Fix: Updated installation docs to download kubo config also. --- docs/guides/install.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/install.rst b/docs/guides/install.rst index 1be931eef..4eb7683cf 100644 --- a/docs/guides/install.rst +++ b/docs/guides/install.rst @@ -116,10 +116,10 @@ To check that the generation of the keys succeeded, check the content of your ke 3. Run the node with Docker Compose =================================== -Download the Docker Compose file that defines how to run PyAleph and IPFS together. +Download the Kubo config file and Docker Compose file that defines how to run PyAleph and IPFS together. .. parsed-literal:: - + wget "https://raw.githubusercontent.com/aleph-im/pyaleph/|pyaleph_version|/deployment/samples/docker-compose/kubo.json" wget "https://raw.githubusercontent.com/aleph-im/pyaleph/|pyaleph_version|/deployment/samples/docker-compose/docker-compose.yml" At this stage, you will need your configuration file and your keys.