Skip to content
Snippets Groups Projects
Commit 7da2ff75 authored by Hugo Trentesaux's avatar Hugo Trentesaux
Browse files

removes websocket since webrtc was added and webtransport works

parent 194aeb9b
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,6 @@ HASURA_LISTEN_PORT=8888 ...@@ -7,7 +7,6 @@ HASURA_LISTEN_PORT=8888
HASURA_GRAPHQL_ADMIN_SECRET=hasura_admin_secret HASURA_GRAPHQL_ADMIN_SECRET=hasura_admin_secret
KUBO_GATEWAY_PORT=8080 KUBO_GATEWAY_PORT=8080
KUBO_DOMAIN=datapod.coinduf.eu KUBO_DOMAIN=datapod.coinduf.eu
KUBO_WEBSOCKET_DOMAIN=websocket.datapod.coinduf.eu
KUBO_GATEWAY_DOMAIN=gateway.datapod.coinduf.eu KUBO_GATEWAY_DOMAIN=gateway.datapod.coinduf.eu
KUBO_GATEWAY_SUBDOMAIN=pagu.re KUBO_GATEWAY_SUBDOMAIN=pagu.re
SUBMIT_GATEWAY_LISTEN_PORT=3000 SUBMIT_GATEWAY_LISTEN_PORT=3000
......
...@@ -36,11 +36,9 @@ services: ...@@ -36,11 +36,9 @@ services:
kubo: kubo:
image: h30x/datapod-kubo image: h30x/datapod-kubo
ports: ports:
# p2p port public # p2p port public (tcp, udp, webtransport, webrtc)
- 4001:4001 - 4001:4001/tcp
- 4001:4001/udp - 4001:4001/udp
# p2p through websocket
- 127.0.0.1:4002:4002
# public gateway # public gateway
- 127.0.0.1:${KUBO_GATEWAY_PORT}:8080 - 127.0.0.1:${KUBO_GATEWAY_PORT}:8080
- '[::1]:${KUBO_GATEWAY_PORT}:8080' - '[::1]:${KUBO_GATEWAY_PORT}:8080'
...@@ -52,7 +50,6 @@ services: ...@@ -52,7 +50,6 @@ services:
# - kubo_init:/container-init.d # - kubo_init:/container-init.d
environment: environment:
KUBO_DOMAIN: ${KUBO_DOMAIN} KUBO_DOMAIN: ${KUBO_DOMAIN}
KUBO_WEBSOCKET_DOMAIN: ${KUBO_WEBSOCKET_DOMAIN}
KUBO_GATEWAY_DOMAIN: ${KUBO_GATEWAY_DOMAIN} KUBO_GATEWAY_DOMAIN: ${KUBO_GATEWAY_DOMAIN}
KUBO_GATEWAY_SUBDOMAIN: ${KUBO_GATEWAY_SUBDOMAIN} KUBO_GATEWAY_SUBDOMAIN: ${KUBO_GATEWAY_SUBDOMAIN}
restart: always restart: always
......
...@@ -9,26 +9,24 @@ ipfs key gen dd_tamt_hist || true ...@@ -9,26 +9,24 @@ ipfs key gen dd_tamt_hist || true
ipfs key gen dd_profiles || true ipfs key gen dd_profiles || true
# --- addresses --- # --- addresses ---
# enable p2p, websocket, quic, webtransport # enable p2p, quic, webtransport, webrtc
ipfs config Swarm.Transports.Network.Websocket --json true # ipfs config Swarm.Transports.Network.Websocket --json true
ipfs config Addresses.Swarm --json '[ ipfs config Addresses.Swarm --json '[
"/ip4/0.0.0.0/tcp/4001", "/ip4/0.0.0.0/tcp/4001",
"/ip6/::/tcp/4001", "/ip6/::/tcp/4001",
"/ip4/0.0.0.0/tcp/4002/ws",
"/ip6/::/tcp/4002/ws",
"/ip4/0.0.0.0/udp/4001/webrtc-direct",
"/ip6/::/udp/4001/webrtc-direct",
"/ip4/0.0.0.0/udp/4001/quic-v1", "/ip4/0.0.0.0/udp/4001/quic-v1",
"/ip6/::/udp/4001/quic-v1", "/ip6/::/udp/4001/quic-v1",
"/ip4/0.0.0.0/udp/4001/quic-v1/webtransport", "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport",
"/ip6/::/udp/4001/quic-v1/webtransport" "/ip6/::/udp/4001/quic-v1/webtransport",
"/ip4/0.0.0.0/udp/4001/webrtc-direct",
"/ip6/::/udp/4001/webrtc-direct"
]' ]'
# configure the addresses to announce # TODO announce IPv6 # configure the addresses to announce # TODO announce IPv6
ipfs config Addresses.Announce --json "[ ipfs config Addresses.Announce --json "[
\"/dns/$KUBO_DOMAIN/tcp/4001\", \"/dns/$KUBO_DOMAIN/tcp/4001\",
\"/dns/$KUBO_WEBSOCKET_DOMAIN/tcp/443/wss/\",
\"/dns/$KUBO_DOMAIN/udp/4001/quic-v1\", \"/dns/$KUBO_DOMAIN/udp/4001/quic-v1\",
\"/dns/$KUBO_DOMAIN/udp/4001/quic-v1/webtransport\" \"/dns/$KUBO_DOMAIN/udp/4001/quic-v1/webtransport\",
\"/dns/$KUBO_DOMAIN/udp/4001/webrtc-direct\"
]" ]"
# --- peering --- # --- peering ---
......
...@@ -4,16 +4,16 @@ set -e ...@@ -4,16 +4,16 @@ set -e
# Get the version number from package.json # Get the version number from package.json
version_tag=$(grep -oP '"version": "\K[^"]+' package.json) version_tag=$(grep -oP '"version": "\K[^"]+' package.json)
# --- datapod # # --- datapod
docker buildx build -f Dockerfile -t duniter-datapod . # docker buildx build -f Dockerfile -t duniter-datapod .
# Tag with version and 'latest' # # Tag with version and 'latest'
docker image tag duniter-datapod h30x/duniter-datapod:$version_tag # docker image tag duniter-datapod h30x/duniter-datapod:$version_tag
docker image tag duniter-datapod h30x/duniter-datapod:latest # docker image tag duniter-datapod h30x/duniter-datapod:latest
# Push both # # Push both
docker image push h30x/duniter-datapod:$version_tag # docker image push h30x/duniter-datapod:$version_tag
docker image push h30x/duniter-datapod:latest # docker image push h30x/duniter-datapod:latest
# --- kubo # --- kubo
docker buildx build -f Dockerfile.Kubo -t datapod-kubo . docker buildx build -f Dockerfile.Kubo -t datapod-kubo .
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment