Merge pull request #141 from dappnode/v0.2.5

v0.2.5 Release
dappnode · Apr 21, 2020 · 6ff540d · 6ff540d
2 parents 1873bf3 + 54caff4
commit 6ff540d
Show file tree

Hide file tree

Showing 9 changed files with 246 additions and 263 deletions.
diff --git a/VPN-min.png → avatar.vpn.png b/VPN-min.png → avatar.vpn.png
diff --git a/build/bin/ovpn_genconfig b/build/bin/ovpn_genconfig
diff --git a/build/src/entrypoint.sh b/build/src/entrypoint.sh
@@ -45,5 +45,5 @@ echo 1 > /proc/sys/net/ipv4/conf/eth0/proxy_arp
 # Save environment
 env | sed '/affinity/d' > /etc/env.sh
 
-# Supervisord processes:
-supervisord -c supervisord.conf
+# Supervisord procs
+exec supervisord -c supervisord.conf
diff --git a/build/src/package.json b/build/src/package.json
@@ -17,9 +17,9 @@
   "author": "dappLion & vdo",
   "license": "ISC",
   "dependencies": {
-    "autobahn": "^19.9.2",
+    "autobahn": "^19.12.1",
     "chalk": "^2.4.2",
-    "commander": "^3.0.1",
+    "commander": "^3.0.2",
     "ip": "^1.1.5",
     "is-ip": "^3.1.0",
     "node-fetch": "^2.6.0",

diff --git a/build/src/src/getAdminCredentials.js b/build/src/src/getAdminCredentials.js
@@ -14,6 +14,10 @@ console.log(`
   Loading VPN parameters... It may take a while, press CTRL + C to skip this process
 `);
 
+process.on("SIGINT", function() {
+  process.exit(128);
+});
+
 // Wait for the loginMsg to exist
 check();
 function check() {
@@ -26,7 +30,8 @@ function check() {
         console.error(`loginMsgFile missing after ${maxAttempts} attempts`);
       else setTimeout(check, pauseTime);
     } else {
-      console.log(loginMsg);
+      if (loginMsg.trim()) console.log(loginMsg);
+      else setTimeout(check, pauseTime);
     }
   });
 }
diff --git a/build/src/yarn.lock b/build/src/yarn.lock
@@ -124,9 +124,9 @@ acorn-jsx@^5.0.2:
   integrity sha512-tiNTrP1MP0QrChmD2DdupCr6HWSFeKVw5d/dHTu4Y7rkAkRhU/Dt7dphAfIUyxtHpl/eBVip5uTNSpQJHylpAw==
 
 acorn@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
-  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
+  integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
 ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
   version "6.10.2"

diff --git a/dappnode_package.json b/dappnode_package.json
@@ -1,30 +1,8 @@
 {
   "name": "vpn.dnp.dappnode.eth",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Dappnode package responsible for providing the VPN (OpenVPN) connection",
-  "avatar": "/ipfs/QmdTZF5oA5uVJ3CCJmfoMrjKvpkSLvoTZ2jZqVu9jxCEig",
   "type": "dncore",
-  "image": {
-    "path": "",
-    "hash": "",
-    "size": "",
-    "volumes": [
-      "/etc/hostname:/etc/vpnname:ro",
-      "/lib/modules:/lib/modules:ro",
-      "/var/run/docker.sock:/var/run/docker.sock",
-      "/usr/src/dappnode/config:/usr/src/app/config:ro",
-      "vpndnpdappnodeeth_data:/usr/src/app/secrets",
-      "vpndnpdappnodeeth_config:/etc/openvpn",
-      "vpndnpdappnodeeth_shared:/var/spool/openvpn"
-    ],
-    "ports": [
-      "1194:1194/udp"
-    ],
-    "privileged": true,
-    "restart": "always",
-    "subnet": "172.33.0.0/16",
-    "ipv4_address": "172.33.1.4"
-  },
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
   "contributors": [
     "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)",

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,41 +1,36 @@
-version: "3.4"
-
+version: '3.4'
 networks:
-    network:
-        driver: bridge
-        ipam:
-            config:
-              - subnet: 172.33.0.0/16
-
+  network:
+    driver: bridge
+    ipam:
+      config:
+        - subnet: 172.33.0.0/16
 volumes:
-    vpndnpdappnodeeth_data: {}
-    vpndnpdappnodeeth_config: {}
-    vpndnpdappnodeeth_shared: {}
-
+  vpndnpdappnodeeth_data: {}
+  vpndnpdappnodeeth_config: {}
+  vpndnpdappnodeeth_shared: {}
 services:
-    vpn.dnp.dappnode.eth:
-        build:
-            context: .
-            dockerfile: ./build/Dockerfile
-        image: "vpn.dnp.dappnode.eth:0.2.3"
-        container_name: DAppNodeCore-vpn.dnp.dappnode.eth
-        privileged: true
-        restart: always
-        volumes:
-            - "/var/run/docker.sock:/var/run/docker.sock"
-            - "/etc/hostname:/etc/vpnname:ro"
-            - "/usr/src/dappnode/config:/usr/src/app/config:ro"
-            - "/lib/modules:/lib/modules:ro"
-            - "vpndnpdappnodeeth_data:/usr/src/app/secrets"
-            - "vpndnpdappnodeeth_config:/etc/openvpn"
-            - "vpndnpdappnodeeth_shared:/var/spool/openvpn"
-        ports:
-            - "1194:1194/udp"
-        dns: 172.33.1.2
-        networks:
-            network:
-                ipv4_address: 172.33.1.4
-        logging:
-            options:
-                max-size: "10m"
-                max-file: "3"
+  vpn.dnp.dappnode.eth:
+    build:
+      context: .
+      dockerfile: ./build/Dockerfile
+    image: 'vpn.dnp.dappnode.eth:0.2.5'
+    container_name: DAppNodeCore-vpn.dnp.dappnode.eth
+    privileged: true
+    restart: always
+    volumes:
+      - '/var/run/docker.sock:/var/run/docker.sock'
+      - '/etc/hostname:/etc/vpnname:ro'
+      - '/usr/src/dappnode/config:/usr/src/app/config:ro'
+      - '/lib/modules:/lib/modules:ro'
+      - 'vpndnpdappnodeeth_data:/usr/src/app/secrets'
+      - 'vpndnpdappnodeeth_config:/etc/openvpn'
+      - 'vpndnpdappnodeeth_shared:/var/spool/openvpn'
+    ports:
+      - '1194:1194/udp'
+    dns: 172.33.1.2
+    networks:
+      network:
+        ipv4_address: 172.33.1.4
+    logging:
+      driver: journald
diff --git a/releases.json b/releases.json
@@ -0,0 +1,10 @@
+{
+  "0.2.4": {
+    "hash": "/ipfs/QmaP4xFLPXiNzcMCWoSboQZgrDLicrohs7SbfaFcJJMEPD",
+    "type": "manifest",
+    "uploadedTo": {
+      "dappnode": "Tue, 19 Nov 2019 17:32:32 GMT"
+    },
+    "link": "http://my.dappnode/#/sdk/publish/r=vpn.dnp.dappnode.eth&v=0.2.4&h=%2Fipfs%2FQmaP4xFLPXiNzcMCWoSboQZgrDLicrohs7SbfaFcJJMEPD"
+  }
+}