Просмотр исходного кода

Merge pull request #1451 from porter-dev/master

Lock node version to 16 -> staging
Nicolas Frati 4 лет назад
Родитель
Сommit
9c650d6d50
2 измененных файлов с 5 добавлено и 5 удалено
  1. 1 3
      docker/Dockerfile
  2. 4 2
      ee/docker/ee.Dockerfile

+ 1 - 3
docker/Dockerfile

@@ -37,13 +37,11 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 # Webpack build environment
 # -------------------------
-FROM node:lts as build-webpack
+FROM node:16 as build-webpack
 WORKDIR /webpack
 
 COPY ./dashboard ./
 
-RUN node --version
-
 RUN npm install -g npm@8.1
 
 RUN npm i --legacy-peer-deps

+ 4 - 2
ee/docker/ee.Dockerfile

@@ -38,12 +38,14 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
 
 # Webpack build environment
 # -------------------------
-FROM node:lts as build-webpack
+FROM node:16 as build-webpack
 WORKDIR /webpack
 
 COPY ./dashboard ./
 
-RUN npm i
+RUN npm install -g npm@8.1
+
+RUN npm i --legacy-peer-deps
 
 ENV NODE_ENV=production