Merge pull request #35 from perara/master

updates

Dockerfile

@@ -1,12 +1,15 @@
-FROM node
+FROM node:14-alpine
 
 COPY ./wg_dashboard_frontend /tmp/build
 WORKDIR /tmp/build
-RUN npm install && npm install -g @angular/cli
+RUN apk add --no-cache build-base python3-dev && \
+npm install && npm install -g @angular/cli && \
+rm -rf node_modules && \ 
+apk del build-base python3-dev
 RUN ng build --configuration="production"
 
 
-FROM alpine:latest
+FROM alpine:3.12
 MAINTAINER per@sysx.no
 ENV IS_DOCKER True
 WORKDIR /app

scripts/ci.sh

@@ -3,7 +3,7 @@
 if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" != "master" ]; then
   docker buildx build \
     --progress plain \
-    --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
+    --platform=linux/amd64,linux/arm64/v8,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
     .
   exit $?
 fi
@@ -11,7 +11,7 @@ echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin &> /dev/null
 TAG="${TRAVIS_TAG:-latest}"
 docker buildx build \
      --progress plain \
-    --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
+    --platform=linux/amd64,linux/arm64/v8,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
     -t $DOCKER_REPO:$TAG \
     --push \
     .

wg_dashboard_frontend/package.json

@@ -71,7 +71,7 @@
     "@angular/language-service": "9.1.0",
     "@types/node": "^13.11.0",
     "codelyzer": "^5.1.2",
-    "node-sass": "4.13.1",
+    "node-sass": "4.14.1",
     "pre-commit": "1.2.2",
     "stylelint": "13.3.0",
     "stylelint-config-recommended-scss": "4.2.0",