Revert "trigger private IP range migration (#1779)"

This reverts commit 6595209.

packages/params/src/params.ts

@@ -118,12 +118,12 @@ export const params = {
   WIREGUARD_DEVICES_ENVNAME: "PEERS",
 
   // Docker network parameters
-  DOCKER_NETWORK_SUBNET: "10.20.0.0/24",
+  DOCKER_NETWORK_SUBNET: "172.33.0.0/16", // "10.20.0.0/24";
   DOCKER_PRIVATE_NETWORK_NAME: "dncore_network",
   DOCKER_EXTERNAL_NETWORK_NAME: "dnpublic_network",
   DOCKER_LEGACY_DNS: "172.33.1.2",
-  BIND_IP: "10.20.0.2",
-  DAPPMANAGER_IP: "10.20.0.7",
+  BIND_IP: "172.33.1.2", // "10.20.0.2"
+  DAPPMANAGER_IP: "172.33.1.7", // "10.20.0.7";
 
   // Docker compose parameters
   // Use of new compose file feature: network name

packages/schemas/src/params.ts

@@ -26,5 +26,6 @@ export const dockerParams = {
     "ipfs.dappnode",
     "bind.dappnode",
   ],
+  DNS_SERVICE: "172.33.1.2",
   MINIMUM_COMPOSE_FILE_VERSION: "3.4",
 };

packages/schemas/src/validateDappnodeCompose.ts

@@ -108,9 +108,11 @@ function validateComposeService(
   const { dns, pid, privileged, network_mode, volumes } =
     compose.services[serviceName];
 
-  // Check that dns is not defined, it must be used native docker networks
-  if (!isCore && dns)
-    err(`service ${serviceName} has DNS ${dns} but is not allowed`);
+  // Check that if defined, the DNS must be the one provided from the bind package
+  if (!isCore && dns && !dockerParams.DNS_SERVICE.includes(dns))
+    err(
+      `service ${serviceName} has DNS different than ${dockerParams.DNS_SERVICE}`
+    );
 
   // Check compose pid feature can only be used with the format service:*. The pid:host is dangerous
   if (pid && !pid.startsWith("service:"))