diff options
| author | Sunil Shetye | 2024-10-10 17:13:10 +0530 |
|---|---|---|
| committer | Sunil Shetye | 2024-10-10 17:13:10 +0530 |
| commit | 63bff49a7998750fbc196200017d4e1f9fd720cc (patch) | |
| tree | 2acf46cb78f7e0057295f7db384fde04f16be43a | |
| parent | 616f8830984550d85ade7ef379d6d1efa58b49b9 (diff) | |
| download | Common-Interface-Project-63bff49a7998750fbc196200017d4e1f9fd720cc.tar.gz Common-Interface-Project-63bff49a7998750fbc196200017d4e1f9fd720cc.tar.bz2 Common-Interface-Project-63bff49a7998750fbc196200017d4e1f9fd720cc.zip | |
update node to 18.20.2
| -rw-r--r-- | blocks/Dockerfile | 13 | ||||
| -rw-r--r-- | blocks/Dockerfile.patch | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/blocks/Dockerfile b/blocks/Dockerfile index 87f33108..a962da50 100644 --- a/blocks/Dockerfile +++ b/blocks/Dockerfile @@ -8,9 +8,7 @@ ENV HOME=/root ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 -ARG NODE_VERSION=v18.19.1 -ARG NODE=node-${NODE_VERSION}-linux-x64 -ARG NODE_DIR=${HOME}/${NODE} +ARG NODE_DIR=${HOME}/node ENV PATH=${NODE_DIR}/bin:${PATH} SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -107,10 +105,13 @@ FROM base AS build-xcos RUN apt-get update -qq && \ apt-get install -qq --no-install-recommends gawk python3-pip python3-venv wget xz-utils +ARG NODE_VERSION=v18.20.2 +ARG NODE=node-${NODE_VERSION}-linux-x64 WORKDIR ${HOME} -RUN wget -q --no-hsts https://nodejs.org/download/release/${NODE_VERSION}/${NODE}.tar.xz -RUN tar xf ${NODE}.tar.xz -RUN rm -f ${NODE}.tar.xz +RUN wget -q --no-hsts https://nodejs.org/download/release/${NODE_VERSION}/${NODE}.tar.xz && \ + mkdir -p ${NODE_DIR} && \ + tar xf ${NODE}.tar.xz -C ${NODE_DIR} --strip-components=1 && \ + rm -f ${NODE}.tar.xz # Build XCos ARG XCOS_DIR=${HOME}/xcosblocks diff --git a/blocks/Dockerfile.patch b/blocks/Dockerfile.patch index 3b775536..78de7a95 100644 --- a/blocks/Dockerfile.patch +++ b/blocks/Dockerfile.patch @@ -1,6 +1,6 @@ ---- blocks/Dockerfile 2024-05-21 17:16:25.937563973 +0530 -+++ blocks/Dockerfile.1 2024-05-21 17:17:14.925514110 +0530 -@@ -118,7 +118,7 @@ +--- Dockerfile 2024-10-10 16:47:04.746578352 +0530 ++++ Dockerfile.1 2024-10-10 17:09:51.818144917 +0530 +@@ -119,7 +119,7 @@ COPY . . # Configure venv and sqlite3 @@ -9,7 +9,7 @@ # Cleanup RUN apt-get autoremove -qq --purge gawk python3-pip python3-venv wget xz-utils -@@ -169,4 +169,4 @@ +@@ -170,4 +170,4 @@ WORKDIR ${XCOS_DIR} |