소스 검색

Merge pull request #15454 from richardkchapman/npm-v14

HPCC-26666 NodeJS version 16

Reviewed-by: Jake Smith <jake.smith@lexisnexisrisk.com>
Reviewed-by: Gordon Smith <GordonJSmith@gmail.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 3 년 전
부모
커밋
4eca081d03
3개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      dockerfiles/buildall-common.sh
  2. 3 3
      dockerfiles/platform-build-base/Dockerfile
  3. 1 1
      dockerfiles/platform-build/Dockerfile

+ 1 - 1
dockerfiles/buildall-common.sh

@@ -20,7 +20,7 @@
 # Build script to create and publish Docker containers corresponding to a GitHub tag
 # This script is normally invoked via GitHub actions, whenever a new tag is pushed
 
-BASE_VER=7.12.1                                 # The docker hub label for the platform-build-base image. Changes rarely.
+BASE_VER=8.6                                    # The docker hub label for the platform-build-base image. Changes rarely.
 BUILD_TAG=$(git describe --exact-match --tags || true)  # The git tag for the images we are building
 BUILD_LABEL=${BUILD_TAG}                        # The docker hub label for all other components
 BUILD_USER=hpcc-systems                         # The github repo owner

+ 3 - 3
dockerfiles/platform-build-base/Dockerfile

@@ -21,8 +21,8 @@ FROM ubuntu:20.04 as build
 ENV DEBIAN_FRONTEND=noninteractive
 ARG BASE_VER
 
-# This is version 7.12.1 of the platform-build-base, and anyone building/using it should have set that in BASE_VER
-RUN [ "${BASE_VER}" = "7.12.1" ]
+# This is version 8.6 of the platform-build-base, and anyone building/using it should have set that in BASE_VER
+RUN [ "${BASE_VER}" = "8.6" ]
  
 RUN apt clean -y && \
     apt autoclean -y && \
@@ -88,7 +88,7 @@ RUN apt-get install -y \
   jq
 
 RUN curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
-RUN apt-add-repository "deb https://deb.nodesource.com/node_12.x $(lsb_release -sc) main"
+RUN apt-add-repository "deb https://deb.nodesource.com/node_16.x $(lsb_release -sc) main"
 RUN apt-get update -y
 RUN apt-get install -y nodejs
 

+ 1 - 1
dockerfiles/platform-build/Dockerfile

@@ -17,7 +17,7 @@
 
 # Base container image that builds all HPCC platform components
 
-ARG BASE_VER=7.12.1 
+ARG BASE_VER=8.6 
 FROM hpccsystems/platform-build-base:${BASE_VER}
 
 RUN groupadd -g 10001 hpcc