From 1849fc03b762828be72782613a3276c1d7faafa3 Mon Sep 17 00:00:00 2001 From: Jian Li Date: Wed, 18 Oct 2023 11:35:15 +0900 Subject: [PATCH] fix: support to run in ARM64 environment (#4102) * fix: support to run in ARM64 environment Signed-off-by: Jian Li * Fix: resolve .build-deps and python2 dependency issue Signed-off-by: Jian Li --------- Signed-off-by: Jian Li --- build/Dockerfile | 7 ++++--- build/Dockerfile.dapper | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index c34bc05f494..79175d68509 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -3,14 +3,15 @@ # that can be found in the LICENSE file. # Prepare the build environment -FROM node:12-alpine3.14 as builder +FROM node:14-alpine as builder ARG YARN_VERSION=1.22.4 WORKDIR /kubesphere ADD . /kubesphere/ -RUN apk add --no-cache --virtual .build-deps ca-certificates python2 python3 py3-pip make openssl g++ bash +RUN apk add --no-cache --virtual python2 +RUN apk add --no-cache --virtual .build-deps ca-certificates python3 py3-pip make openssl g++ bash RUN npm install yarn@${YARN_VERSION} # If you have trouble downloading the yarn binary, try the following: @@ -32,7 +33,7 @@ RUN mv /kubesphere/package.json /out/ ############## # Final Image ############## -FROM node:12-alpine3.14 as base_os_context +FROM node:14-alpine as base_os_context RUN adduser -D -g kubesphere -u 1002 kubesphere && \ mkdir -p /opt/kubesphere/console && \ diff --git a/build/Dockerfile.dapper b/build/Dockerfile.dapper index df1bb321b82..33203bae8d6 100644 --- a/build/Dockerfile.dapper +++ b/build/Dockerfile.dapper @@ -2,7 +2,7 @@ # Use of this source code is governed by an Apache license # that can be found in the LICENSE file. -FROM node:12-alpine3.14 +FROM node:14-alpine RUN adduser -D -g kubesphere -u 1002 kubesphere && \ mkdir -p /opt/kubesphere/console && \