iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #638 from marudor/fixCI 

Fix CI
This commit is contained in:
msquare 2019-08-19 10:41:04 +02:00 committed by GitHub
parent 53ec14b9c4 0b8cf704c8
commit 030e1ab38d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/nginx/Dockerfile
View File

@ -1,7 +1,6 @@
FROM node:8-alpine as themes FROM node:10-alpine as themes
WORKDIR /app WORKDIR /app
RUN apk add --no-cache yarn COPY .babelrc .browserslistrc package.json webpack.config.js yarn.lock /app/
COPY .babelrc .browserslistrc package.json webpack.config.js /app/
RUN yarn install RUN yarn install
COPY resources/assets/ /app/resources/assets COPY resources/assets/ /app/resources/assets
RUN yarn build RUN yarn build

2
package.json
View File

@ -32,7 +32,7 @@
"file-loader": "^2.0.0", "file-loader": "^2.0.0",
"imports-loader": "^0.8.0", "imports-loader": "^0.8.0",
"less": "^3.9.0", "less": "^3.9.0",
"less-loader": "^4.0.5", "less-loader": "^5",
"mini-css-extract-plugin": "^0.4.5", "mini-css-extract-plugin": "^0.4.5",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"npm-run-all": "^4.1.3", "npm-run-all": "^4.1.3",