Skip to content

Commit

Permalink
Bump Node.js version to 22 LTS (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
caponetto authored Dec 6, 2024
1 parent af3b0c6 commit e039fdb
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ on:

env:
FORCE_COLOR: true
NODE_VERSION: 20.11.0
NODE_VERSION: 22
YARN_VERSION: 3.5.0
PYTHON_VERSION: 3.11
QUAY_WORKBENCH_IMAGES_REPOSITORY: 'opendatahub/workbench-images'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ on:

env:
FORCE_COLOR: true
NODE_VERSION: 20.11.0
NODE_VERSION: 22
YARN_VERSION: 3.5.0
PYTHON_VERSION: 3.11

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-version-through-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
required: true

env:
NODE_VERSION: 20.11.0
NODE_VERSION: 22
YARN_VERSION: 3.5.0
PYTHON_VERSION: 3.11

Expand Down
32 changes: 16 additions & 16 deletions etc/docker/elyra_development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:latest

ARG TARGETARCH

ENV NODE_VERSION 20
ENV NODE_VERSION 22
ENV TINI_VERSION v0.19.0

RUN echo ">> Building for TARGETARCH=${TARGETARCH}, NODE_VERSION=${NODE_VERSION}, TINI_VERSION=${TINI_VERSION}"
Expand All @@ -11,29 +11,29 @@ ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
ENV PATH /opt/conda/bin:$PATH

RUN <<EOF
apt-get update --fix-missing
apt-get install -y make wget bzip2 ca-certificates curl git
apt-get clean
apt-get update --fix-missing
apt-get install -y make wget bzip2 ca-certificates curl git
apt-get clean
rm -rf /var/lib/apt/lists/*
EOF

COPY requirements.yml requirements.yml

RUN /bin/bash <<EOF
if [ "${TARGETARCH}" == "arm64" ]; then
if [ "${TARGETARCH}" == "arm64" ]; then
CONDA_ARCH="aarch64"
else
CONDA_ARCH=${TARGETARCH:-"x86_64"}
fi
# CONDA_ARCH expansion needs to be escaped to avoid docker expanding the variable before calling the shell
echo "wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Linux-\${CONDA_ARCH}.sh -O ~/miniconda.sh"
wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Linux-\${CONDA_ARCH}.sh -O ~/miniconda.sh
/bin/bash ~/miniconda.sh -b -p /opt/conda
rm ~/miniconda.sh
/opt/conda/bin/conda clean -tipy
ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh
echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc
echo "conda activate elyra-env" >> ~/.bashrc
wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Linux-\${CONDA_ARCH}.sh -O ~/miniconda.sh
/bin/bash ~/miniconda.sh -b -p /opt/conda
rm ~/miniconda.sh
/opt/conda/bin/conda clean -tipy
ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh
echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc
echo "conda activate elyra-env" >> ~/.bashrc
/opt/conda/bin/conda env create --file requirements.yml
EOF

Expand All @@ -47,15 +47,15 @@ RUN curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /usr
apt-get update && apt-get install yarn && apt-get install -y build-essential

# add tini
RUN /bin/bash <<EOF
if [ "${TARGETARCH}" == "x86_64" ]; then
RUN /bin/bash <<EOF
if [ "${TARGETARCH}" == "x86_64" ]; then
TINI_FILE=tini
else
TINI_FILE=tini-${TARGETARCH}
TINI_FILE=tini-${TARGETARCH}
fi
# TINI_FILE expansion needs to be escaped to avoid docker expanding the variable before calling the shell
echo "wget --quiet https://github.com/krallin/tini/releases/download/${TINI_VERSION}/\${TINI_FILE} -O /usr/bin/tini"
wget --quiet https://github.com/krallin/tini/releases/download/${TINI_VERSION}/\${TINI_FILE} -O /usr/bin/tini
wget --quiet https://github.com/krallin/tini/releases/download/${TINI_VERSION}/\${TINI_FILE} -O /usr/bin/tini
chmod +x /usr/bin/tini
EOF

Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,9 @@
"typedoc-plugin-mdn-links": "^3.0.3",
"typescript": "~5.1.6",
"webpack": "^5.76.1"
},
"engines": {
"node": "^22.0.0",
"yarn": "3.5.0"
}
}

0 comments on commit e039fdb

Please sign in to comment.