diff options
| author | msquare <msquare@notrademark.de> | 2019-08-19 10:41:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 10:41:04 +0200 |
| commit | 030e1ab38d1b147aa180e1a2887764ba329a8560 (patch) | |
| tree | 4908e3bb20d704259c102260ec00472763fb53c2 | |
| parent | 53ec14b9c492a0607d834d17aab4b4597e24a214 (diff) | |
| parent | 0b8cf704c87c1bcd4ebe851eacedba87270452a1 (diff) | |
Merge pull request #638 from marudor/fixCI
Fix CI
| -rw-r--r-- | contrib/nginx/Dockerfile | 5 | ||||
| -rw-r--r-- | package.json | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/contrib/nginx/Dockerfile b/contrib/nginx/Dockerfile index 3fe424aa..82b6b1e6 100644 --- a/contrib/nginx/Dockerfile +++ b/contrib/nginx/Dockerfile @@ -1,7 +1,6 @@ -FROM node:8-alpine as themes +FROM node:10-alpine as themes WORKDIR /app -RUN apk add --no-cache yarn -COPY .babelrc .browserslistrc package.json webpack.config.js /app/ +COPY .babelrc .browserslistrc package.json webpack.config.js yarn.lock /app/ RUN yarn install COPY resources/assets/ /app/resources/assets RUN yarn build diff --git a/package.json b/package.json index c60f039e..5a8a5a44 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "file-loader": "^2.0.0", "imports-loader": "^0.8.0", "less": "^3.9.0", - "less-loader": "^4.0.5", + "less-loader": "^5", "mini-css-extract-plugin": "^0.4.5", "mkdirp": "^0.5.1", "npm-run-all": "^4.1.3", |