diff --git a/.env.prod.example b/.env.prod.example index 58b9fb5a847871d9a970e36a6b15df2248a69d6b..2132cbe70c62e853334ccdf3534f739a474ebc8a 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -7,7 +7,6 @@ HASURA_LISTEN_PORT=8888 HASURA_GRAPHQL_ADMIN_SECRET=hasura_admin_secret KUBO_GATEWAY_PORT=8080 KUBO_DOMAIN=datapod.coinduf.eu -KUBO_WEBSOCKET_DOMAIN=websocket.datapod.coinduf.eu KUBO_GATEWAY_DOMAIN=gateway.datapod.coinduf.eu KUBO_GATEWAY_SUBDOMAIN=pagu.re SUBMIT_GATEWAY_LISTEN_PORT=3000 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 7bb1ea73f3bf89690b973d75c01babb777dbe335..bc433f3d6f701725a94db259fcb1a9ac3185b264 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -36,11 +36,9 @@ services: kubo: image: h30x/datapod-kubo ports: - # p2p port public - - 4001:4001 + # p2p port public (tcp, udp, webtransport, webrtc) + - 4001:4001/tcp - 4001:4001/udp - # p2p through websocket - - 127.0.0.1:4002:4002 # public gateway - 127.0.0.1:${KUBO_GATEWAY_PORT}:8080 - '[::1]:${KUBO_GATEWAY_PORT}:8080' @@ -52,7 +50,6 @@ services: # - kubo_init:/container-init.d environment: KUBO_DOMAIN: ${KUBO_DOMAIN} - KUBO_WEBSOCKET_DOMAIN: ${KUBO_WEBSOCKET_DOMAIN} KUBO_GATEWAY_DOMAIN: ${KUBO_GATEWAY_DOMAIN} KUBO_GATEWAY_SUBDOMAIN: ${KUBO_GATEWAY_SUBDOMAIN} restart: always diff --git a/scripts/configure.sh b/scripts/configure.sh index 642dc5d2e88cc89b678f022970680bfef80e1bb9..a6a9f4ada513d3528a621b80f0c3bb16defa9521 100644 --- a/scripts/configure.sh +++ b/scripts/configure.sh @@ -9,26 +9,24 @@ ipfs key gen dd_tamt_hist || true ipfs key gen dd_profiles || true # --- addresses --- -# enable p2p, websocket, quic, webtransport -ipfs config Swarm.Transports.Network.Websocket --json true +# enable p2p, quic, webtransport, webrtc +# ipfs config Swarm.Transports.Network.Websocket --json true ipfs config Addresses.Swarm --json '[ "/ip4/0.0.0.0/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", "/ip6/::/udp/4001/quic-v1", "/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 ipfs config Addresses.Announce --json "[ \"/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/webtransport\" + \"/dns/$KUBO_DOMAIN/udp/4001/quic-v1/webtransport\", + \"/dns/$KUBO_DOMAIN/udp/4001/webrtc-direct\" ]" # --- peering --- diff --git a/scripts/docker-build.sh b/scripts/docker-build.sh index 03240da301ecd958c19457b5350c0d23967b88ad..997eb8c185f10714cdbac170f86dc9a7e90985f8 100755 --- a/scripts/docker-build.sh +++ b/scripts/docker-build.sh @@ -4,16 +4,16 @@ set -e # Get the version number from package.json version_tag=$(grep -oP '"version": "\K[^"]+' package.json) -# --- datapod -docker buildx build -f Dockerfile -t duniter-datapod . +# # --- datapod +# docker buildx build -f Dockerfile -t duniter-datapod . -# Tag with version and 'latest' -docker image tag duniter-datapod h30x/duniter-datapod:$version_tag -docker image tag duniter-datapod h30x/duniter-datapod:latest +# # Tag with version and 'latest' +# docker image tag duniter-datapod h30x/duniter-datapod:$version_tag +# docker image tag duniter-datapod h30x/duniter-datapod:latest -# Push both -docker image push h30x/duniter-datapod:$version_tag -docker image push h30x/duniter-datapod:latest +# # Push both +# docker image push h30x/duniter-datapod:$version_tag +# docker image push h30x/duniter-datapod:latest # --- kubo docker buildx build -f Dockerfile.Kubo -t datapod-kubo .