Skip to content

Commit a7acfea

Browse files
Merge branch 'microsoft:main' into main
2 parents e184267 + 007bc8f commit a7acfea

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

alpine-arm64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM arm64v8/node:14.16.0-alpine
1+
FROM arm64v8/node:16.19.1-alpine
22

3-
RUN apk add g++ python make git bash curl perl pkgconfig libsecret-dev && uname -m
3+
RUN apk add g++ python3 make git bash curl perl pkgconfig libsecret-dev && uname -m
44

55
RUN mkdir -p /root/vscode
66
WORKDIR /root/vscode

alpine-x64/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ARG REPO=node
2-
ARG TAG=14.16.0-alpine
2+
ARG TAG=16.19.1-alpine
33
FROM ${REPO}:${TAG}
44

5-
RUN apk add g++ python make git bash curl perl pkgconfig libsecret-dev
5+
RUN apk add g++ python3 make git bash curl perl pkgconfig libsecret-dev
66

77
RUN mkdir -p /root/vscode
88
WORKDIR /root/vscode

centos7-devtoolset8-arm64/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ ARG INSTALL_PKGS="devtoolset-8-gcc \
66
devtoolset-8-gdb \
77
make \
88
git \
9+
unzip \
910
sudo \
1011
libsecret-devel \
1112
nodejs \

centos7-devtoolset8-x64/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ ARG INSTALL_PKGS="devtoolset-8-gcc \
88
devtoolset-8-gdb \
99
make \
1010
git \
11+
unzip \
1112
sudo \
1213
libsecret-devel \
1314
nodejs \
@@ -27,5 +28,10 @@ RUN npm install -g yarn
2728

2829
ENV PATH=/opt/rh/devtoolset-8/root/usr/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
2930

31+
# install cmake3
32+
RUN git clone https://gitlab.kitware.com/cmake/cmake.git
33+
RUN cd cmake && git checkout v3.26.0 && ./bootstrap --prefix=/usr/local -- -DCMAKE_USE_OPENSSL=OFF \
34+
make && make install
35+
3036
RUN mkdir -p /root/vscode
3137
WORKDIR /root/vscode

0 commit comments

Comments
 (0)