Skip to content

Commit d97fc6c

Browse files
dothebartKVS85
dothebart
and
KVS85
authored
Feature/new nodejs (#628)
* make the noise * new nodejs * pin version * move gnupg install up * Raise devel build image tag * move gnupg install up * move gnupg install up * use nvm * set links * set links --------- Co-authored-by: Vadim Kondratev <[email protected]>
1 parent 04f8b79 commit d97fc6c

File tree

4 files changed

+41
-16
lines changed

4 files changed

+41
-16
lines changed

‎containers/buildUbuntuDevel.docker/Dockerfile.arm64‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN /static/rebuild_glibc.sh
1414

1515
FROM ubuntu:24.04 as prepare
1616

17-
RUN apt-get update && apt-get upgrade -y && apt-get install -y libgd3 linux-libc-dev libcrypt-dev libnsl-dev rpcsvc-proto libtirpc-dev
17+
RUN apt-get update && apt-get upgrade -y && apt-get install -y libgd3 linux-libc-dev libcrypt-dev libnsl-dev rpcsvc-proto libtirpc-dev curl gnupg gnupg2
1818

1919
COPY --from=glibcdebs /root/debs /debs
2020
RUN dpkg -i /debs/*.deb
@@ -40,7 +40,7 @@ ARG CLANG_FULL_VERSION
4040

4141
RUN apt-get update --fix-missing && \
4242
apt-get upgrade -y && \
43-
apt-get install -y software-properties-common net-tools wget gnupg lsb-release
43+
apt-get install -y software-properties-common net-tools wget lsb-release
4444

4545
WORKDIR /
4646

@@ -95,7 +95,7 @@ ENV COMPILER_VERSION=${COMPILER_VERSION}
9595
ENV CLANG_VERSION=${CLANG_VERSION}
9696

9797
RUN apt-get update --fix-missing && \
98-
apt-get install -y software-properties-common net-tools gnupg2 wget && \
98+
apt-get install -y software-properties-common net-tools wget && \
9999
apt-get update && \
100100
apt-get upgrade -y
101101

@@ -110,19 +110,31 @@ ENV DEBIAN_FRONTEND=noninteractive
110110
RUN apt-get update --fix-missing && \
111111
apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} \
112112
cmake make bison flex python3 ccache git libjemalloc-dev vim exuberant-ctags gdb fish \
113-
psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus bc tcpdump \
113+
psmisc sudo debhelper debconf jq wget libdb-dev gcovr prometheus bc tcpdump \
114114
liburing-dev cppcheck clang-${CLANG_VERSION} lldb-${CLANG_VERSION} lld-${CLANG_VERSION} \
115115
libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev \
116-
libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-${CLANG_VERSION}-dev liblapack-dev libopenblas-dev gfortran \
116+
libclang-rt-${CLANG_VERSION}-dev libomp-${CLANG_VERSION}-dev liblapack-dev libopenblas-dev gfortran \
117117
&& apt-get clean
118118

119-
# yarn for UI build:
120-
RUN npm install -g yarn
121-
122119
# sccache for cloud compiler cache:
123120

124121
RUN curl -L https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v${SCCACHE_VERSION}-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v${SCCACHE_VERSION}-${ARCH}-unknown-linux-musl
125122

123+
124+
# yarn for UI build:
125+
ARG NODE_VERSION="20.14.0"
126+
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
127+
export NVM_DIR="$HOME/.nvm" &&\
128+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \
129+
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
130+
nvm install ${NODE_VERSION} && \
131+
nvm use ${NODE_VERSION} && \
132+
node --version && \
133+
npm install -g yarn && \
134+
ln -s /root/.nvm/versions/node/v${NODE_VERSION}/bin/* /usr/local/bin/
135+
136+
137+
126138
# Fetch V8:
127139
#COPY --from=v8 /opt/v8/lib /opt/v8/lib
128140
#COPY --from=v8 /opt/v8/include /opt/v8/include

‎containers/buildUbuntuDevel.docker/Dockerfile.x86-64‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN /static/rebuild_glibc.sh
1414

1515
FROM ubuntu:24.04 as prepare
1616

17-
RUN apt-get update && apt-get upgrade -y && apt-get install -y libgd3 linux-libc-dev libcrypt-dev libnsl-dev rpcsvc-proto libtirpc-dev
17+
RUN apt-get update && apt-get upgrade -y && apt-get install -y libgd3 linux-libc-dev libcrypt-dev libnsl-dev rpcsvc-proto libtirpc-dev curl gnupg gnupg2
1818

1919
COPY --from=glibcdebs /root/debs /debs
2020
RUN dpkg -i /debs/*.deb
@@ -39,7 +39,7 @@ ARG CLANG_VERSION
3939

4040
RUN apt-get update --fix-missing && \
4141
apt-get upgrade -y && \
42-
apt-get install -y software-properties-common net-tools wget gnupg lsb-release
42+
apt-get install -y software-properties-common net-tools wget lsb-release
4343

4444
WORKDIR /
4545

@@ -94,7 +94,7 @@ ENV COMPILER_VERSION=${COMPILER_VERSION}
9494
ENV CLANG_VERSION=${CLANG_VERSION}
9595

9696
RUN apt-get update --fix-missing && \
97-
apt-get install -y software-properties-common net-tools gnupg2 wget && \
97+
apt-get install -y software-properties-common net-tools wget && \
9898
apt-get update && \
9999
apt-get upgrade -y
100100

@@ -109,19 +109,31 @@ ENV DEBIAN_FRONTEND=noninteractive
109109
RUN apt-get update --fix-missing && \
110110
apt-get install -y build-essential gcc-${COMPILER_VERSION} g++-${COMPILER_VERSION} \
111111
cmake make bison flex python3 ccache git libjemalloc-dev vim exuberant-ctags gdb fish \
112-
psmisc sudo debhelper debconf jq wget libdb-dev curl gnupg2 gcovr prometheus bc tcpdump \
112+
psmisc sudo debhelper debconf jq wget libdb-dev gcovr prometheus bc tcpdump \
113113
liburing-dev cppcheck clang-${CLANG_VERSION} lldb-${CLANG_VERSION} lld-${CLANG_VERSION} \
114114
libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev libclang-common-${CLANG_VERSION}-dev \
115-
libclang-rt-${CLANG_VERSION}-dev nodejs npm libomp-${CLANG_VERSION}-dev liblapack-dev libopenblas-dev gfortran \
115+
libclang-rt-${CLANG_VERSION}-dev libomp-${CLANG_VERSION}-dev liblapack-dev libopenblas-dev gfortran \
116116
&& apt-get clean
117117

118-
# yarn for UI build:
119-
RUN npm install -g yarn
120118

121119
# sccache for cloud compiler cache:
122120

123121
RUN curl -L https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-${ARCH}-unknown-linux-musl.tar.gz | tar xvz -C /tmp && mv /tmp/sccache-v${SCCACHE_VERSION}-${ARCH}-unknown-linux-musl/sccache /usr/bin/sccache && chmod +x /usr/bin/sccache && rm -rf /tmp/sccache-v${SCCACHE_VERSION}-${ARCH}-unknown-linux-musl
124122

123+
124+
# yarn for UI build:
125+
ARG NODE_VERSION="20.14.0"
126+
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash && \
127+
export NVM_DIR="$HOME/.nvm" &&\
128+
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \
129+
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
130+
nvm install ${NODE_VERSION} && \
131+
nvm use ${NODE_VERSION} && \
132+
node --version && \
133+
npm install -g yarn && \
134+
ln -s /root/.nvm/versions/node/v${NODE_VERSION}/bin/* /usr/local/bin/
135+
136+
125137
# Fetch V8:
126138
#COPY --from=v8 /opt/v8/lib /opt/v8/lib
127139
#COPY --from=v8 /opt/v8/include /opt/v8/include

‎helper.linux.fish‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else
2222
end
2323

2424
set -gx UBUNTUBUILDIMAGE_312_NAME arangodb/ubuntubuildarangodb-devel
25-
set -gx UBUNTUBUILDIMAGE_312_TAG 12
25+
set -gx UBUNTUBUILDIMAGE_312_TAG 13
2626
set -gx UBUNTUBUILDIMAGE_312 $UBUNTUBUILDIMAGE_312_NAME:$UBUNTUBUILDIMAGE_312_TAG-$UBUNTUBUILDIMAGE_TAG_ARCH
2727

2828
set -gx UBUNTUBUILDIMAGE_311_NAME arangodb/ubuntubuildarangodb-311

‎jenkins/runRTAtest.fish‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env fish
2+
set -l fish_trace on
23
source jenkins/helper/jenkins.fish
34

45
cleanPrepareLockUpdateClear2

0 commit comments

Comments
 (0)