Browse Source

Merge pull request #35 from perara/master

updates
pull/51/head
Per-Arne Andersen 4 years ago
committed by GitHub
parent
commit
38f1443db6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      Dockerfile
  2. 4
      scripts/ci.sh
  3. 2
      wg_dashboard_frontend/package.json

9
Dockerfile

@ -1,12 +1,15 @@
FROM node FROM node:14-alpine
COPY ./wg_dashboard_frontend /tmp/build COPY ./wg_dashboard_frontend /tmp/build
WORKDIR /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" RUN ng build --configuration="production"
FROM alpine:latest FROM alpine:3.12
MAINTAINER per@sysx.no MAINTAINER per@sysx.no
ENV IS_DOCKER True ENV IS_DOCKER True
WORKDIR /app WORKDIR /app

4
scripts/ci.sh

@ -3,7 +3,7 @@
if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" != "master" ]; then if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" != "master" ]; then
docker buildx build \ docker buildx build \
--progress plain \ --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 $? exit $?
fi fi
@ -11,7 +11,7 @@ echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin &> /dev/null
TAG="${TRAVIS_TAG:-latest}" TAG="${TRAVIS_TAG:-latest}"
docker buildx build \ docker buildx build \
--progress plain \ --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 \ -t $DOCKER_REPO:$TAG \
--push \ --push \
. .

2
wg_dashboard_frontend/package.json

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

Loading…
Cancel
Save