Merge pull request #7 from dappnode/v0.2.0-alpha

v0.2.0 alpha

.travis.yml

@@ -1,12 +1,22 @@
 language: node_js
-dist: trusty
+dist: xenial
 sudo: required
 
+# ########################
+# How to trigger a release
+#
+# Push a tag to origin:
+# - "release" (= patch)
+# - "release/patch"
+# - "release/minor"
+# - "release/major"
+# ########################
+
 stages:
   - name: build-test
-    if: tag != "release"
+    if: tag !~ /^release\/(major|minor|patch)$/
   - name: release
-    if: tag = "release"
+    if: tag =~ /^release\/(major|minor|patch)$/
 
 jobs:
   include:
@@ -29,14 +39,18 @@ jobs:
       script:
         - npm install -g @dappnode/dappnodesdk
         - docker-compose build
-        - dappnodesdk publish patch -p infura
-      node_js: lts/*
+        - "TYPE=${TRAVIS_TAG##*/}"
+        - "[ ! '$TYPE' = 'release' ] || TYPE='patch'"
+        - dappnodesdk publish ${TYPE} -p infura
+      node_js:
+        - "10.15.3"
       before_deploy:
         - wget https://raw.githubusercontent.com/dappnode/DAppNode/master/scripts/before_deploy.sh
         - source before_deploy.sh
       deploy:
         provider: releases
         prerelease: true
+        overwrite: true
         api_key: "$GITHUB_TOKEN"
         file_glob: true
         # $RELEASE_VERSION is exported on before_deploy.sh
@@ -46,9 +60,8 @@ jobs:
         name: "$TRAVIS_TAG"
         body: "# Changelog"
         on:
-          branch: master
           tags: true
-          condition: "$TRAVIS_TAG =~ ^release*$"
-      after_deploy:
-        - wget https://raw.githubusercontent.com/dappnode/DAppNode/master/scripts/after_deploy.sh
-        - source after_deploy.sh
+          condition: "$TRAVIS_TAG = release || $TRAVIS_TAG = release/patch || $TRAVIS_TAG = release/minor || $TRAVIS_TAG = release/major"
+      # after_deploy:
+      #   - wget https://raw.githubusercontent.com/dappnode/DAppNode/master/scripts/after_deploy.sh
+      #   - source after_deploy.sh

README.md

@@ -1,14 +1,10 @@
 # DAppNode Package WIFI (Core)
 
-<p align="left">
-  <img src="WIFI-min.png" width="200"/>
-</p>
-
 [![Website dappnode.io](https://img.shields.io/badge/Website-dappnode.io-brightgreen.svg)](https://dappnode.io/)
-[![Documentation Wiki](https://img.shields.io/badge/Documentation-Wiki-brightgreen.svg)](https://github.com/dappnode/DAppNode/wiki)
-[![GIVETH Campaign](https://img.shields.io/badge/GIVETH-Campaign-1e083c.svg)](https://alpha.giveth.io/campaigns/OcKJryNwjeidMXi9)
-[![RIOT DAppNode](https://img.shields.io/badge/RIOT-DAppNode-blue.svg)](https://riot.im/app/#/room/#DAppNode:matrix.org)
-[![Twitter Follow](https://img.shields.io/twitter/follow/espadrine.svg?style=social&label=Follow)](https://twitter.com/DAppNODE?lang=es)
+[![Documentation Wiki](https://img.shields.io/badge/Documentation-Wiki-brightgreen.svg)](https://docs.dappnode.io)
+[![GIVETH Campaign](https://img.shields.io/badge/GIVETH-Campaign-1e083c.svg)](https://donate.dappnode.io)
+[![RIOT DAppNode](https://img.shields.io/badge/RIOT-DAppNode-blue.svg)](https://riot.dappnode.io)
+[![Twitter Follow](https://img.shields.io/twitter/follow/espadrine.svg?style=social&label=Follow)](https://twitter.dappnode.io)
 
 Dappnode package responsible for providing wifi access to the internal network.
 

build/wlanstart.sh

@@ -7,8 +7,8 @@ if [ ! -w "/sys" ] ; then
 fi
 
 # Default values
-true ${SUBNET:=172.33.10.0}
-true ${AP_ADDR:=172.33.10.254}
+true ${SUBNET:=172.33.12.0}
+true ${AP_ADDR:=172.33.12.254}
 true ${DNS:=172.33.1.2}
 true ${NAT:=true}
 true ${INTERFACE:=}

dappnode_package.json

@@ -1,6 +1,6 @@
 {
   "name": "wifi.dnp.dappnode.eth",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "A WIFI hotspot for DAppNode",
   "avatar": "",
   "type": "dncore",
@@ -12,29 +12,25 @@
     "privileged": "true",
     "subnet": "172.33.0.0/16",
     "ipv4_address": "172.33.1.10",
-    "volumes": [
-      "/var/run/docker.sock:/var/run/docker.sock"
-    ],
+    "volumes": ["/var/run/docker.sock:/var/run/docker.sock"],
     "environment": [
       "SSID=DAppNodeWIFI",
       "WPA_PASSPHRASE=dappnode",
       "NAT=true",
       "CHANNEL=11",
       "MODE=admin",
-      "INTERFACE"
+      "INTERFACE="
     ]
   },
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
   "contributors": [
     "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)",
     "Abel Vdo <vdo@greyfaze.net> (https://github.com/vdo)"
   ],
-  "keywords": [
-    "DAppNodeCore",
-    "WIFI",
-    "Hotspot"
-  ],
-  "homepage": "https://github.com/dappnode/DNP_WIFI#readme",
+  "keywords": ["DAppNodeCore", "WIFI", "Hotspot"],
+  "links": {
+    "homepage": "https://github.com/dappnode/DNP_WIFI#readme"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/dappnode/DNP_WIFI"

docker-compose.yml

@@ -1,26 +1,26 @@
-version: '3.4'
+version: "3.4"
 networks:
   network:
     driver: bridge
     ipam:
       config:
         - subnet: 172.33.0.0/16
 services:
-    wifi.dnp.dappnode.eth:
-        image: 'wifi.dnp.dappnode.eth:0.1.0'
-        container_name: 'DAppNodeCore-wifi.dnp.dappnode.eth'
-        build: ./build
-        env_file:
-          - wifi.dnp.dappnode.eth.env
-        volumes:
-          - /var/run/docker.sock:/var/run/docker.sock
-        dns: 172.33.1.2
-        privileged: true
-        restart: always
-        networks:
-            network:
-                ipv4_address: 172.33.1.10
-        logging:
-            options:
-                max-size: "10m"
-                max-file: "3"
+  wifi.dnp.dappnode.eth:
+    image: "wifi.dnp.dappnode.eth:0.2.0"
+    container_name: "DAppNodeCore-wifi.dnp.dappnode.eth"
+    build: ./build
+    env_file:
+      - wifi.dnp.dappnode.eth.env
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    dns: 172.33.1.2
+    privileged: true
+    restart: always
+    networks:
+      network:
+        ipv4_address: 172.33.1.10
+    logging:
+      options:
+        max-size: "10m"
+        max-file: "3"