Browse Source

Merge pull request #49 from perara/master

Update dev
pull/50/head
Per-Arne Andersen 4 years ago
committed by GitHub
parent
commit
9b4ad7e88a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      Dockerfile
  2. 4
      scripts/ci.sh

5
Dockerfile

@ -3,11 +3,10 @@ FROM node:14-alpine
COPY ./wg_dashboard_frontend /tmp/build
WORKDIR /tmp/build
RUN apk add --no-cache build-base python3-dev && \
npm install && npm install -g @angular/cli && \
npm cache clean --force && npm install && npm install -g @angular/cli && \
ng build --configuration="production" && \
rm -rf node_modules && \
apk del build-base python3-dev
RUN ng build --configuration="production"
FROM alpine:3.12
MAINTAINER per@sysx.no

4
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/arm64/v8,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 \
.
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/arm64/v8,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 \
-t $DOCKER_REPO:$TAG \
--push \
.

Loading…
Cancel
Save