fix: add default env sample

.env-sample

@@ -0,0 +1,28 @@
+#####
+# DOCKER COMPOSE
+#####
+
+# mainnet or testnet network
+NETWORK=testnet # mainnet
+
+#####
+# CLIENT
+#####
+
+# # Testnet
+NEXT_PUBLIC_HOMESERVER=8pinxxgqs41n4aididenw5apqp1urfmzdztr8jt4abrkdn435ewo
+NEXT_PUBLIC_NEXUS=http://localhost:8080
+NEXT_PUBLIC_TESTNET=true
+NEXT_PUBLIC_DEFAULT_HTTP_RELAY=http://localhost:15412/link/
+NEXT_PUBLIC_PKARR_RELAYS=["https://pkarr.pubky.app","https://pkarr.pubky.org"] # Ignored when using Testnet
+NEXT_ENABLE_PLAUSIBLE=false
+
+# Mainnet
+# NEXT_PUBLIC_HOMESERVER=8pinxxgqs41n4aididenw5apqp1urfmzdztr8jt4abrkdn435ewo
+# NEXT_PUBLIC_NEXUS=http://localhost:8080
+# NEXT_PUBLIC_TESTNET=false
+# NEXT_PUBLIC_DEFAULT_HTTP_RELAY=https://httprelay.staging.pubky.app/link/
+
+# # Replace with these for mainnet Staging servers
+# NEXT_PUBLIC_HOMESERVER=ufibwbmed6jeq9k4p583go95wofakh9fwpp4k734trq79pd9u1uy
+# NEXT_PUBLIC_NEXUS=https://nexus.staging.pubky.app

docker-compose.yml

@@ -7,12 +7,14 @@ services:
     volumes:
       - ./pkarr.config.toml:/config.toml
       - .storage/pkarr:/cache
-    command: pkarr-server --config=/config.toml
-    # networks:
-    #   - default
-    # ports:
-    #   - 6882:6882
-    network_mode: host
+    command: pkarr-relay --config=/config.toml
+    networks:
+      pubky:
+        ipv4_address: "172.18.0.2"
+    ports:
+      - 6882:6882
+    profiles:
+      - pkarr
 
   # 2. Pubky Homeserver
   homeserver:
@@ -27,13 +29,19 @@ services:
     env_file:
       - ./.env
     entrypoint: [ "/bin/sh", "-c", "/entrypoint.sh" ]
-    # networks:
-    #   - default
-    # ports:
-    #   - 6287:6287
-    #  depends_on:
-    #  - pkarr
-    network_mode: host
+    networks:
+      pubky:
+        ipv4_address: "172.18.0.4"
+    ports:
+      - 6287:6287
+      - 6286:6286
+      - 6288:6288
+      - 15411:15411
+      - 15412:15412
+    depends_on:
+      pkarr:
+        condition: "service_started"
+        required: false
 
   # 3 Nexus
   # 3.1 Pubky Nexus Daemon
@@ -48,11 +56,11 @@ services:
       - .storage/static:/static
       # Mount the config file
       - ./pubky-nexus-config-${NETWORK:-testnet}.toml:/config/config.toml
-    # ports:
-    #   - 8080:8080
-    # networks:
-    #   - default
-    network_mode: host
+    ports:
+      - 8080:8080
+    networks:
+      pubky:
+        ipv4_address: "172.18.0.3"
     depends_on:
       - nexus-neo4j
       - nexus-redis
@@ -62,12 +70,12 @@ services:
     image: neo4j:5.26.7-community
     container_name: nexus-neo4j
     restart: unless-stopped
-    # ports: 
-    #   - 7474:7474
-    #   - 7687:7687
-    # networks:
-    #   - default
-    network_mode: host
+    ports:
+      - 7474:7474
+      - 7687:7687
+    networks:
+      pubky:
+        ipv4_address: "172.18.0.5"
     volumes:
       # Mount the neo4j configuration file to container
       - .storage/neo4j/conf:/conf
@@ -82,12 +90,12 @@ services:
   nexus-redis:
     image: redis/redis-stack:7.2.0-v11
     container_name: nexus-redis
-    # ports:
-    #   - 6379:6379
-    #   - 8001:8001 # Redis Insight http://localhost:8001/
-    # networks:
-    #   - default
-    network_mode: host
+    ports:
+      - 6379:6379
+      - 8001:8001 # Redis Insight http://localhost:8001/
+    networks:
+      pubky:
+        ipv4_address: "172.18.0.6"
     volumes:
       - .storage/redis/data:/data
       - ./redis.conf:/usr/local/etc/redis/redis.conf
@@ -108,15 +116,20 @@ services:
     env_file:
       - ./.env
     command: [ "npm", "run", "serve:prod" ]
-    # networks:
-    #   - default
-    # ports:
-    #   - 4200:4200
-    network_mode: host
+    networks:
+      pubky:
+        ipv4_address: "172.18.0.7"
+    ports:
+      - 4200:4200
 
 networks:
-  default:
+  pubky:
     driver: bridge
+    enable_ipv6: false
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.18.0.0/16
 
 volumes:
   backend_storage:

homeserver.config.toml

@@ -6,3 +6,7 @@ signup_mode = "token_required"
 
 [pkdns]
 icann_domain = "localhost"
+public_ip = "172.18.0.4"
+
+[derive]
+testnet_host = "homeserver"

homeserver.entrypoint.sh

@@ -1,4 +1,3 @@
-
 #!/bin/sh
 
 # Check the NETWORK environment variable and execute the appropriate command

neo4j.env

@@ -10,7 +10,7 @@ NEO4J_AUTH=neo4j/12345678 # ${NEO4J_DB_USERNAME}/${NEO4J_PASSWORD}
 # https://neo4j.com/docs/operations-manual/current/docker/configuration/
 # Modify the default configuration
 # Raise memory limits
-NEO4J_server_memory_pagecache_size=2G
-NEO4J_server_memory_heap_initial__size=4G
-NEO4J_server_memory_heap_max__size=8G
+NEO4J_server_memory_pagecache_size=1G
+NEO4J_server_memory_heap_initial__size=1G
+NEO4J_server_memory_heap_max__size=2G
 NEO4J_apoc_uuid_enabled=false

pubky-nexus-config-testnet.toml

@@ -1,6 +1,6 @@
 [api]
 name = "nexusd.api"
-public_addr = "127.0.0.1:8080"
+public_addr = "0.0.0.0:8080"
 
 [watcher]
 name = "nexusd.watcher"
@@ -17,8 +17,8 @@ log_level = "debug"
 files_path = "/static/files/"
 
 [stack.db]
-redis = "redis://localhost:6379"
+redis = "redis://nexus-redis:6379"
 
 [stack.db.neo4j]
-uri = "bolt://localhost:7687"
+uri = "bolt://nexus-neo4j:7687"
 password = "12345678"