Skip to content

Commit 05fa6f9

Browse files
authored
Increase Docker Image version (#815)
* Feature: Increase Docker image version to last stable and replace docs by the last version tag. * Fix: Updated installation docs to download kubo config also.
1 parent 3cf1938 commit 05fa6f9

File tree

8 files changed

+56
-20
lines changed

8 files changed

+56
-20
lines changed

deployment/docker-build/dev/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
pyaleph:
1111
# platform: linux/amd64
1212
restart: always
13-
# image: alephim/pyaleph-node:0.5.8
13+
# image: alephim/pyaleph-node:0.8.0
1414
image: localhost/alephim/pyaleph-node-dev:build
1515
build:
1616
dockerfile: ./deployment/docker-build/dev/Dockerfile
@@ -35,7 +35,7 @@ services:
3535
pyaleph-api:
3636
# platform: linux/amd64
3737
restart: always
38-
# image: alephim/pyaleph-node:0.5.8
38+
# image: alephim/pyaleph-node:0.8.0
3939
image: localhost/alephim/pyaleph-node:build
4040
build:
4141
dockerfile: ./deployment/docker-build/dev/Dockerfile

deployment/docker-build/dev/kubo.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@
66
"Strategy": "pinned"
77
},
88
"Routing": {
9-
"Type": "dhtclient",
10-
"AcceleratedDHTClient": true
9+
"Type": "dhtserver"
1110
},
11+
"Bootstrap": [
12+
"/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di",
13+
"/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj",
14+
"/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
15+
"/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
16+
],
1217
"Datastore": {
18+
"StorageMax": "1500GB",
1319
"GCPeriod": "12h"
1420
},
1521
"Swarm": {
1622
"EnableHolePunching":true,
1723
"RelayService": {
1824
"Enabled": false
19-
}
25+
},
26+
"AddrFilters": [
27+
"/ip4/86.84.0.0/ipcidr/16"
28+
]
2029
}
2130
}

deployment/docker-build/kubo.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@
66
"Strategy": "pinned"
77
},
88
"Routing": {
9-
"Type": "dhtclient",
10-
"AcceleratedDHTClient": true
9+
"Type": "dhtserver"
1110
},
11+
"Bootstrap": [
12+
"/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di",
13+
"/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj",
14+
"/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
15+
"/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
16+
],
1217
"Datastore": {
18+
"StorageMax": "1500GB",
1319
"GCPeriod": "12h"
1420
},
1521
"Swarm": {
1622
"EnableHolePunching":true,
1723
"RelayService": {
1824
"Enabled": false
19-
}
25+
},
26+
"AddrFilters": [
27+
"/ip4/86.84.0.0/ipcidr/16"
28+
]
2029
}
2130
}

deployment/docker-build/test/kubo.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@
66
"Strategy": "pinned"
77
},
88
"Routing": {
9-
"Type": "dhtclient",
10-
"AcceleratedDHTClient": true
9+
"Type": "dhtserver"
1110
},
11+
"Bootstrap": [
12+
"/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di",
13+
"/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj",
14+
"/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
15+
"/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
16+
],
1217
"Datastore": {
18+
"StorageMax": "1500GB",
1319
"GCPeriod": "12h"
1420
},
1521
"Swarm": {
1622
"EnableHolePunching":true,
1723
"RelayService": {
1824
"Enabled": false
19-
}
25+
},
26+
"AddrFilters": [
27+
"/ip4/86.84.0.0/ipcidr/16"
28+
]
2029
}
2130
}

deployment/samples/docker-compose/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ volumes:
1111
services:
1212
pyaleph:
1313
restart: always
14-
image: alephim/pyaleph-node:0.7.4
14+
image: alephim/pyaleph-node:0.8.0
1515
command: --config /opt/pyaleph/config.yml --key-dir /opt/pyaleph/keys -v
1616
volumes:
1717
- ./config.yml:/opt/pyaleph/config.yml
@@ -30,7 +30,7 @@ services:
3030

3131
pyaleph-api:
3232
restart: always
33-
image: alephim/pyaleph-node:0.7.4
33+
image: alephim/pyaleph-node:0.8.0
3434
command: --config /opt/pyaleph/config.yml --key-dir /opt/pyaleph/keys -v
3535
entrypoint: ["bash", "deployment/scripts/run_aleph_ccn_api.sh"]
3636
ports:

deployment/samples/docker-compose/kubo.json

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,25 @@
66
"Strategy": "pinned"
77
},
88
"Routing": {
9-
"Type": "dhtclient",
10-
"AcceleratedDHTClient": true
9+
"Type": "dhtserver"
1110
},
11+
"Bootstrap": [
12+
"/ip4/51.159.57.71/tcp/4001/p2p/12D3KooWSdcuGvLfXgc6BPgDEqWYQirGpBWUmyXRwK5RmyM1T7Di",
13+
"/ip4/46.255.204.209/tcp/4001/p2p/12D3KooWHWNCn8t9NKQPBPZU61Fq6BoVw9XV37YsWTuMLwZXrEtj",
14+
"/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN",
15+
"/ip4/104.131.131.82/tcp/4001/p2p/QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
16+
],
1217
"Datastore": {
18+
"StorageMax": "1500GB",
1319
"GCPeriod": "12h"
1420
},
1521
"Swarm": {
1622
"EnableHolePunching":true,
1723
"RelayService": {
1824
"Enabled": false
19-
}
25+
},
26+
"AddrFilters": [
27+
"/ip4/86.84.0.0/ipcidr/16"
28+
]
2029
}
2130
}

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,5 +293,5 @@
293293

294294

295295
rst_epilog = """
296-
.. |pyaleph_version| replace:: 0.7.4
296+
.. |pyaleph_version| replace:: 0.8.0
297297
"""

docs/guides/install.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ To check that the generation of the keys succeeded, check the content of your ke
116116
3. Run the node with Docker Compose
117117
===================================
118118

119-
Download the Docker Compose file that defines how to run PyAleph and IPFS together.
119+
Download the Kubo config file and Docker Compose file that defines how to run PyAleph and IPFS together.
120120

121121
.. parsed-literal::
122-
123-
wget "https://raw.githubusercontent.com/aleph-im/pyaleph/main/deployment/samples/docker-compose/docker-compose.yml"
122+
wget "https://raw.githubusercontent.com/aleph-im/pyaleph/|pyaleph_version|/deployment/samples/docker-compose/kubo.json"
123+
wget "https://raw.githubusercontent.com/aleph-im/pyaleph/|pyaleph_version|/deployment/samples/docker-compose/docker-compose.yml"
124124
125125
At this stage, you will need your configuration file and your keys.
126126
Check the configuration section to see how you can generate them.

0 commit comments

Comments
 (0)