Merge pull request #343 from dappnode/v0.2.26

v0.2.26 Release

Author: eduadiez

build/src/src/index.ts

@@ -25,6 +25,7 @@ const logs = Logs(module);
 
 // Start HTTP API
 import "./httpApi";
+import { removeLegacyBindVolume } from "./modules/legacy/removeLegacyBindVolume";
 
 // Start eth forward http proxy
 startEthForward();
@@ -200,6 +201,10 @@ async function runLegacyOps(): Promise<void> {
   migrateEthForward().catch(e =>
     logs.error(`Error migrating ETHFORWARD: ${e.stack}`)
   );
+
+  removeLegacyBindVolume().catch(e =>
+    logs.error(`Error removing legacy BIND volume: ${e.stack}`)
+  );
 }
 
 runLegacyOps();

build/src/src/modules/ethClient/migrateEthchain.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import { changeEthMultiClient } from "./changeEthMultiClient";
 import { listContainerNoThrow } from "../../modules/docker/listContainers";
 import { dockerVolumesList, dockerDf } from "../../modules/docker/dockerApi";
-import { dockerRm } from "../../modules/docker/dockerCommands";
+import { dockerRm, dockerVolumeRm } from "../../modules/docker/dockerCommands";
 import { migrateVolume } from "../../modules/hostScripts";
 import { getUserSettingsSafe } from "../../utils/dockerComposeFile";
 import * as getPath from "../../utils/getPath";
@@ -14,7 +14,9 @@ const ethchainDnpName = "ethchain.dnp.dappnode.eth";
 
 const ethchainVolumes = {
   data: "dncore_ethchaindnpdappnodeeth_data",
-  geth: "dncore_ethchaindnpdappnodeeth_geth"
+  geth: "dncore_ethchaindnpdappnodeeth_geth",
+  identity: "dncore_ethchaindnpdappnodeeth_identity",
+  ipc: "dncore_ethchaindnpdappnodeeth_ipc"
 };
 const openEthereumVolumes = {
   data: "openethereumdnpdappnodeeth_data"
@@ -45,7 +47,7 @@ export async function migrateEthchain(): Promise<void> {
   };
   const isNextOpenEthereum = /parity/i.test(envs.DEFAULT_CLIENT || "");
 
-  const volumeMigrations = [
+  const volumesToMigrate = [
     {
       id: "OpenEthereum data volume",
       from: ethchainVolumes.data,
@@ -64,6 +66,17 @@ export async function migrateEthchain(): Promise<void> {
         !volumes.find(vol => vol.Name === to)
     );
 
+  const volumesToRemove = [
+    {
+      id: "legacy identity volume",
+      name: ethchainVolumes.identity
+    },
+    {
+      id: "legacy IPC volume",
+      name: ethchainVolumes.ipc
+    }
+  ].filter(({ name }) => volumes.find(vol => vol.Name === name));
+
   // Non-blocking step of uninstalling the DNP_ETHCHAIN
   if (ethchain)
     try {
@@ -81,7 +94,7 @@ export async function migrateEthchain(): Promise<void> {
     }
 
   // Non-blocking step of migrating old volumes with a host script
-  for (const { id, from, to } of volumeMigrations) {
+  for (const { id, from, to } of volumesToMigrate) {
     try {
       // Remove all packages that are using the volume to safely move it
       const idsToRemove = await shell(`docker ps -aq --filter volume=${from}`);
@@ -94,11 +107,11 @@ export async function migrateEthchain(): Promise<void> {
     }
   }
   // Optimization to only run `docker system df -v` once, can run for +15s
-  if (volumeMigrations.length > 0)
+  if (volumesToMigrate.length > 0)
     try {
       // Make sure the volume was migrated successfully before removing it
       const { Volumes } = await dockerDf({ noCache: true });
-      for (const { id, from } of volumeMigrations) {
+      for (const { id, from } of volumesToMigrate) {
         const fromVol = Volumes.find(vol => vol.Name === from);
         if (!fromVol)
           logs.warn(`Did not delete ETHCHAIN ${id} ${from}, not found`);
@@ -116,6 +129,18 @@ export async function migrateEthchain(): Promise<void> {
       logs.error(`Error deleting ETHCHAIN volumes: ${e.stack}`);
     }
 
+  for (const { id, name } of volumesToRemove) {
+    try {
+      // Remove all packages that are using the volume to safely move it
+      const idsToRemove = await shell(`docker ps -aq --filter volume=${name}`);
+      if (idsToRemove) throw Error(`Volume is used by ${idsToRemove}`);
+      await dockerVolumeRm(name);
+      logs.info(`Removed ETHCHAIN ${id}`);
+    } catch (e) {
+      logs.error(`Error removing ETHCHAIN ${id}: ${e.stack}`);
+    }
+  }
+
   // Install new package. fullnode.dappnode is assigned after install
   if (ethchain) {
     const target = isNextOpenEthereum ? "openethereum" : "geth";

build/src/src/modules/legacy/removeLegacyBindVolume.ts

@@ -0,0 +1,34 @@
+import Logs from "../../logs";
+import shell from "../../utils/shell";
+import { dockerVolumesList } from "../docker/dockerApi";
+import { dockerVolumeRm } from "../docker/dockerCommands";
+const logs = Logs(module);
+
+const oldBindVol = "dncore_binddnpdappnodeeth_data";
+const newBindVol = "dncore_binddnpdappnodeeth_bind";
+
+/**
+ * After core version 0.2.30 there will be an orphan volume of the
+ * DNP_BIND which should be removed for asthetic versions
+ */
+export async function removeLegacyBindVolume(): Promise<void> {
+  const volumes = await dockerVolumesList();
+  const volumeExists = (name: string): boolean =>
+    volumes.some(vol => vol.Name === name);
+
+  // nuevo-> dncore_binddnpdappnodeeth_bind
+  // viejo-> dncore_binddnpdappnodeeth_data
+  // Remove all packages that are using the volume to safely move it
+
+  if (volumeExists(oldBindVol) && volumeExists(newBindVol)) {
+    const usersOfOld = await shell(
+      `docker ps -aq --filter volume=${oldBindVol}`
+    );
+    if (usersOfOld)
+      throw Error(`legacy BIND volume ${oldBindVol} has users: ${usersOfOld}`);
+
+    // Delete only if has no users
+    await dockerVolumeRm(oldBindVol);
+    logs.info(`Removed legacy BIND volume ${oldBindVol}`);
+  }
+}

dappnode_package.json

@@ -1,6 +1,6 @@
 {
   "name": "dappmanager.dnp.dappnode.eth",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "Dappnode package responsible for providing the DappNode Package Manager",
   "type": "dncore",
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",

docker-compose.yml

@@ -12,7 +12,7 @@ services:
     build:
       context: .
       dockerfile: ./build/Dockerfile
-    image: 'dappmanager.dnp.dappnode.eth:0.2.25'
+    image: 'dappmanager.dnp.dappnode.eth:0.2.26'
     container_name: DAppNodeCore-dappmanager.dnp.dappnode.eth
     restart: always
     volumes: