Skip to content

Commit ce50a22

Browse files
jeanp413jeanp413
committed
Merge remote-tracking branch 'upstream/main'
2 parents 8699fd2 + 4b5eda6 commit ce50a22

File tree

12 files changed

+220
-23
lines changed

12 files changed

+220
-23
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:16.19.1-alpine
1+
FROM arm64v8/node:14.16.0-alpine
22

3-
RUN apk add g++ python3 make git bash curl perl pkgconfig libsecret-dev && uname -m
3+
RUN apk add g++ python 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=16.19.1-alpine
2+
ARG TAG=14.16.0-alpine
33
FROM ${REPO}:${TAG}
44

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

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

‎bionic-x64/Dockerfile renamed to ‎archived/bionic-x64/Dockerfile_Unused

File renamed without changes.

‎bionic-x64/xvfb-init.sh renamed to ‎archived/bionic-x64/xvfb-init.sh

File renamed without changes.

‎buster-arm64/Dockerfile renamed to ‎archived/buster-arm64/Dockerfile_Unused

File renamed without changes.

‎buster-armhf/Dockerfile renamed to ‎archived/buster-armhf/Dockerfile_Unused

File renamed without changes.

‎archived/stretch-armhf/Dockerfile_Unused

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ ARG TAG=stretch
33
FROM ${REPO}:${TAG}
44

55
RUN dpkg --add-architecture armhf
6+
7+
RUN sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list
8+
RUN sed -i 's/security.debian.org/archive.debian.org/g' /etc/apt/sources.list
9+
RUN sed -i '/stretch-updates/d' /etc/apt/sources.list
10+
611
RUN apt-get update && apt-get install -y --no-install-recommends \
712
crossbuild-essential-armhf \
813
git \
914
pkg-config \
10-
fakeroot \
11-
rpm \
1215
sudo \
1316
apt-transport-https \
1417
ca-certificates \
15-
libx11-dev:armhf \
16-
libx11-xcb-dev:armhf \
17-
libxkbfile-dev:armhf \
1818
libsecret-1-dev:armhf \
1919
curl \
2020
gnupg \
@@ -32,28 +32,36 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3232
libffi-dev \
3333
zlib1g-dev
3434

35-
# Compile python3.9 from source
36-
RUN curl -O https://www.python.org/ftp/python/3.9.4/Python-3.9.4.tar.xz
37-
RUN tar -xf Python-3.9.4.tar.xz
38-
RUN cd Python-3.9.4 && ./configure --enable-optimizations && make altinstall
39-
RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.9 1
40-
RUN python --version
41-
4235
# Remove expired CA cert for openSSL 1.0.2
4336
# https://www.openssl.org/blog/blog/2021/09/13/LetsEncryptRootCertExpire/
4437
RUN rm -f /usr/share/ca-certificates/mozilla/DST_Root_CA_X3.crt
4538
RUN update-ca-certificates --fresh
4639

40+
# Install Node.js
41+
RUN curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
42+
Run sudo apt-get install -y nodejs
43+
RUN node --version
44+
4745
# Yarn
4846
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
4947
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
5048
RUN apt-get update && apt-get install -y yarn
5149

50+
# Compile python3.9 from source
51+
RUN curl -O https://www.python.org/ftp/python/3.9.4/Python-3.9.4.tar.xz
52+
RUN tar -xf Python-3.9.4.tar.xz
53+
RUN cd Python-3.9.4 && ./configure --enable-optimizations && make altinstall
54+
RUN update-alternatives --install /usr/bin/python python /usr/local/bin/python3.9 1
55+
RUN python --version
56+
5257
ENV AS=/usr/bin/arm-linux-gnueabihf-as \
5358
AR=/usr/bin/arm-linux-gnueabihf-ar \
5459
CC=/usr/bin/arm-linux-gnueabihf-gcc \
5560
CPP=/usr/bin/arm-linux-gnueabihf-cpp \
5661
CXX=/usr/bin/arm-linux-gnueabihf-g++ \
5762
LD=/usr/bin/arm-linux-gnueabihf-ld \
5863
FC=/usr/bin/arm-linux-gnueabihf-gfortran \
59-
PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
64+
PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
65+
66+
RUN mkdir -p /root/vscode
67+
WORKDIR /root/vscode

‎azure-pipelines.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
jobs:
2-
- job: bionic_x64
2+
- job: focal_x64
33
pool:
44
vmImage: 'ubuntu-latest'
55
steps:
66
- template: build.yml
77
parameters:
8-
arch: bionic-x64
8+
arch: focal-x64
99

1010
- job: centos7_devtoolset8_x64
1111
pool:
@@ -41,21 +41,21 @@ jobs:
4141
qemu: 'true'
4242
arch: alpine-arm64
4343

44-
- job: buster_arm64
44+
- job: bionic_arm64
4545
pool:
4646
vmImage: 'ubuntu-latest'
4747
steps:
4848
- template: build.yml
4949
parameters:
50-
arch: buster-arm64
50+
arch: bionic-arm64
5151

52-
- job: buster_armhf
52+
- job: bionic_armhf
5353
pool:
5454
vmImage: 'ubuntu-latest'
5555
steps:
5656
- template: build.yml
5757
parameters:
58-
arch: buster-armhf
58+
arch: bionic-armhf
5959

6060
- job: snapcraft_x64
6161
pool:

‎bionic-arm64/Dockerfile

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
2+
ARG TAG=18.04
3+
FROM ${REPO}:${TAG}
4+
5+
ARG DEBIAN_FRONTEND=noninteractive
6+
7+
# ubuntu keeps its i386/amd64 and other architecture repos separate
8+
# the default i386/amd64 packages can be found in http://archive.ubuntu.com while all other architectures are in http://ports.ubuntu.com/
9+
# add the required repos for armhf/arm64 and only fetch i386/amd64 from archive.ubuntu.com (to prevent apt from erroring about missing architecture support)
10+
RUN sed -i "s/^deb/deb [arch=amd64,i386]/g" /etc/apt/sources.list
11+
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic main universe multiverse restricted" | tee -a /etc/apt/sources.list
12+
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-security main universe multiverse restricted" | tee -a /etc/apt/sources.list
13+
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-updates main universe multiverse restricted" | tee -a /etc/apt/sources.list
14+
RUN dpkg --add-architecture arm64
15+
RUN apt-get update && apt-get install -y --no-install-recommends \
16+
gcc-8-aarch64-linux-gnu \
17+
g++-8-aarch64-linux-gnu \
18+
binutils-aarch64-linux-gnu \
19+
build-essential \
20+
git \
21+
pkg-config \
22+
fakeroot \
23+
rpm \
24+
sudo \
25+
apt-transport-https \
26+
ca-certificates \
27+
libx11-dev:arm64 \
28+
libx11-xcb-dev:arm64 \
29+
libxkbfile-dev:arm64 \
30+
libsecret-1-dev:arm64 \
31+
curl \
32+
gnupg \
33+
unzip
34+
35+
# Set python3 as default
36+
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
37+
RUN python --version
38+
39+
# Yarn
40+
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
41+
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
42+
RUN apt-get update && apt-get install -y yarn
43+
44+
ENV AS=/usr/bin/aarch64-linux-gnu-as \
45+
AR=/usr/bin/aarch64-linux-gnu-ar \
46+
CC=/usr/bin/aarch64-linux-gnu-gcc-8 \
47+
CPP=/usr/bin/aarch64-linux-gnu-cpp-8 \
48+
CXX=/usr/bin/aarch64-linux-gnu-g++-8 \
49+
LD=/usr/bin/aarch64-linux-gnu-ld \
50+
PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig

‎bionic-armhf/Dockerfile

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
2+
ARG TAG=18.04
3+
FROM ${REPO}:${TAG}
4+
5+
ARG DEBIAN_FRONTEND=noninteractive
6+
7+
# ubuntu keeps its i386/amd64 and other architecture repos separate
8+
# the default i386/amd64 packages can be found in http://archive.ubuntu.com while all other architectures are in http://ports.ubuntu.com/
9+
# add the required repos for armhf/arm64 and only fetch i386/amd64 from archive.ubuntu.com (to prevent apt from erroring about missing architecture support)
10+
RUN sed -i "s/^deb/deb [arch=amd64,i386]/g" /etc/apt/sources.list
11+
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic main universe multiverse restricted" | tee -a /etc/apt/sources.list
12+
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-security main universe multiverse restricted" | tee -a /etc/apt/sources.list
13+
RUN echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ bionic-updates main universe multiverse restricted" | tee -a /etc/apt/sources.list
14+
RUN dpkg --add-architecture armhf
15+
RUN apt-get update && apt-get install -y --no-install-recommends \
16+
gcc-8-arm-linux-gnueabihf \
17+
g++-8-arm-linux-gnueabihf \
18+
binutils-arm-linux-gnueabihf \
19+
build-essential \
20+
git \
21+
pkg-config \
22+
fakeroot \
23+
rpm \
24+
sudo \
25+
apt-transport-https \
26+
ca-certificates \
27+
libx11-dev:armhf \
28+
libx11-xcb-dev:armhf \
29+
libxkbfile-dev:armhf \
30+
libsecret-1-dev:armhf \
31+
curl \
32+
gnupg \
33+
unzip
34+
35+
# Set python3 as default
36+
RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
37+
RUN python --version
38+
39+
# Yarn
40+
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
41+
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
42+
RUN apt-get update && apt-get install -y yarn
43+
44+
ENV AS=/usr/bin/arm-linux-gnueabihf-as \
45+
AR=/usr/bin/arm-linux-gnueabihf-ar \
46+
CC=/usr/bin/arm-linux-gnueabihf-gcc-8 \
47+
CPP=/usr/bin/arm-linux-gnueabihf-cpp-8 \
48+
CXX=/usr/bin/arm-linux-gnueabihf-g++-8 \
49+
LD=/usr/bin/arm-linux-gnueabihf-ld \
50+
PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig

0 commit comments

Comments
 (0)