瀏覽代碼

Merge pull request #13662 from richardkchapman/fursty

HPCC-23441 Switch to Ubuntu 20.04 for base container image

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Gavin Halliday 5 年之前
父節點
當前提交
83a65e08d8

+ 1 - 1
dockerfiles/buildall.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.8                                    # The docker hub label for the platform-build-base image. Changes rarely.
+BASE_VER=7.10                                   # The docker hub label for the platform-build-base image. Changes rarely.
 BUILD_TAG=$(git describe --exact-match --tags)  # 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

@@ -17,7 +17,7 @@
 
 # Build container image containing all 3rd-party tools required to build HPCC platform
 
-FROM ubuntu:18.04 as build
+FROM ubuntu:20.04 as build
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt clean && \
     apt autoclean && \
@@ -84,7 +84,7 @@ RUN apt-get install -y \
 RUN curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
 RUN apt-add-repository "deb https://deb.nodesource.com/node_10.x $(lsb_release -sc) main"
 RUN apt-get update
-RUN apt-get install nodejs
+RUN apt-get install -y nodejs
 
 RUN mkdir /home/temp
 WORKDIR /home/temp
@@ -97,5 +97,5 @@ WORKDIR /
 RUN rm -rf /home/temp
 RUN apt-get clean
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 COPY --from=build / /

+ 1 - 1
dockerfiles/platform-build/Dockerfile

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

+ 3 - 3
dockerfiles/platform-core/Dockerfile

@@ -21,7 +21,7 @@
 
 ARG BUILD_LABEL
 FROM hpccsystems/platform-build:${BUILD_LABEL} as build
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt clean && \
     apt autoclean && \
@@ -43,8 +43,8 @@ RUN apt-get install -y \
   
 RUN apt-get install -y \
   libnuma1 \
-  libboost-regex1.65.1 \
-  libpython3.6 \
+  libboost-regex1.71.0 \
+  libpython3.8 \
   libmemcached11 \
   libmemcachedutil2