Merge pull request #165 from dappnode/v0.2.7

v0.2.7 Release

Author: dapplion

.dockerignore

@@ -13,6 +13,9 @@ build_*
 build/src/dist
 build/ui_openvpn/build
 
+# Ignore tests
+build/src/test
+
 # Version data file
 .version.json
 .git-data.json

.github/workflows/main.yml

@@ -1,36 +1,30 @@
 name: "Main"
 on:
   pull_request:
-    paths:
-      - "build/**"
-      - ".github/workflows/main.yml"
   push:
     branches:
       - "master"
       - "v[0-9]+.[0-9]+.[0-9]+"
-    paths:
-      - "build/**"
+    paths-ignore:
+      - "README.md"
 
 jobs:
   unit-test:
     runs-on: ubuntu-16.04
     name: Tests
-    env:
-      working-directory: ./build/src
+    defaults:
+      run:
+        working-directory: ./build/src
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
         uses: actions/setup-node@v1
         with:
           node-version: "10.x"
       - run: yarn install
-        working-directory: ${{ env.working-directory }}
       - run: yarn lint
-        working-directory: ${{ env.working-directory }}
       - run: yarn test
-        working-directory: ${{ env.working-directory }}
       - run: yarn test:int
-        working-directory: ${{ env.working-directory }}
 
   build-test:
     runs-on: ubuntu-16.04

build/Dockerfile Dockerfilebuild/Dockerfile renamed to Dockerfile

@@ -1,12 +1,14 @@
 ##########################
 # Build dependencies
 ##########################
-FROM alpine:3.9 as build
+# --platform=$BUILDPLATFORM is used build javascript source with host arch
+# Otherwise webpack builds on emulated archs can be extremely slow (+1h)
+FROM --platform=${BUILDPLATFORM:-amd64} node:10.19.0-alpine as build
 
 WORKDIR /usr/src/app
 
 RUN apk add --update --no-cache \
-    build-base python libpcap-dev linux-headers bash nodejs yarn npm
+    build-base python libpcap-dev linux-headers bash
 
 COPY build/src/package.json ./
 COPY build/src/yarn.lock ./
@@ -31,7 +33,7 @@ RUN yarn build
 ##########################
 # Compute git data
 ##########################
-FROM alpine:3.9 as git-data
+FROM --platform=${BUILDPLATFORM:-amd64} node:10.19.0-alpine as git-data
 
 WORKDIR /usr/src/app
 
@@ -45,15 +47,14 @@ RUN node getGitData /usr/src/app/.git-data.json
 ##########################
 # Build UI
 ##########################
-FROM alpine:3.9 as build-ui
+FROM --platform=${BUILDPLATFORM:-amd64} node:10.19.0-alpine as build-ui
 
 WORKDIR /usr/src/app
 
 # ensuring both package.json AND package-lock.json are copied
 COPY build/ui_openvpn/package*.json ./
 COPY build/ui_openvpn/*lock* ./
 # install dependencies
-RUN apk add --no-cache nodejs yarn
 RUN yarn install --production
 # copy the contents of the app
 COPY build/ui_openvpn .
@@ -72,14 +73,7 @@ FROM alpine:3.9
 WORKDIR /usr/src/app
 
 RUN apk add --update \
-    openvpn \
-    iptables \ 
-    bash \
-    easy-rsa \ 
-    openssl \
-    jq \
-    sed \
-    nodejs
+    openvpn iptables bash easy-rsa openssl nodejs
 RUN ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 

build/.dockerignore

@@ -52,7 +52,6 @@
     "chai": "^4.1.2",
     "coveralls": "^3.0.6",
     "eslint": "^6.4.0",
-    "husky": "^1.3.1",
     "mocha": "^6.2.0",
     "nyc": "^14.1.1",
     "prettier": "^1.16.4",
@@ -61,11 +60,5 @@
     "sinon-chai": "^3.1.0",
     "ts-node": "^8.10.2",
     "typescript": "^3.9.6"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "npm run pre-commit",
-      "pre-push": "npm run pre-commit"
-    }
   }
 }