Skip to content

Commit ed545bc

Browse files
jeanp413mustard-mh
authored andcommitted
Update after upstream changes
1 parent 1b48da0 commit ed545bc

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
arch: [bionic-x64, buster-arm64, buster-armhf, centos7-devtoolset8-x64, centos7-devtoolset8-arm64]
13+
arch: [focal-x64, bionic-arm64, bionic-armhf, centos7-devtoolset8-x64, centos7-devtoolset8-arm64]
1414
include:
1515
- arch: centos7-devtoolset8-arm64
1616
qemu: true

archived/bionic-arm64/Dockerfile_Unused

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
1+
ARG REPO=ubuntu
22
ARG TAG=18.04
33
FROM ${REPO}:${TAG}
44

@@ -34,7 +34,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3434
libkrb5-dev:arm64 \
3535
curl \
3636
gnupg \
37-
unzip
37+
unzip \
38+
jq
3839

3940
# No Sudo Prompt
4041
RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser \
@@ -66,4 +67,4 @@ ENV AS=/usr/bin/aarch64-linux-gnu-as \
6667
CPP=/usr/bin/aarch64-linux-gnu-cpp-8 \
6768
CXX=/usr/bin/aarch64-linux-gnu-g++-8 \
6869
LD=/usr/bin/aarch64-linux-gnu-ld \
69-
PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
70+
PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig

archived/bionic-armhf/Dockerfile_Unused

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
1+
ARG REPO=ubuntu
22
ARG TAG=18.04
33
FROM ${REPO}:${TAG}
44

@@ -34,7 +34,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
3434
libkrb5-dev:armhf \
3535
curl \
3636
gnupg \
37-
unzip
37+
unzip \
38+
jq
3839

3940
# No Sudo Prompt
4041
RUN echo 'builduser ALL=NOPASSWD: ALL' >> /etc/sudoers.d/50-builduser \
@@ -66,4 +67,4 @@ ENV AS=/usr/bin/arm-linux-gnueabihf-as \
6667
CPP=/usr/bin/arm-linux-gnueabihf-cpp-8 \
6768
CXX=/usr/bin/arm-linux-gnueabihf-g++-8 \
6869
LD=/usr/bin/arm-linux-gnueabihf-ld \
69-
PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
70+
PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig

archived/focal-x64/Dockerfile_Unused

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
1+
ARG REPO=ubuntu
22
ARG TAG=20.04
33
FROM ${REPO}:${TAG}
44

@@ -44,6 +44,7 @@ RUN apt-get update && apt-get install -y \
4444
xvfb \
4545
tzdata \
4646
unzip \
47+
jq \
4748
&& curl https://chromium.googlesource.com/chromium/src/+/HEAD/build/install-build-deps.sh\?format\=TEXT | base64 --decode | cat > /setup/install-build-deps.sh \
4849
&& curl https://chromium.googlesource.com/chromium/src/+/HEAD/build/install-build-deps.py\?format\=TEXT | base64 --decode | cat > /setup/install-build-deps.py \
4950
# Remove snapcraft to avoid issues on docker build
@@ -82,5 +83,7 @@ RUN sudo mkdir -p /var/run/dbus
8283
RUN gcc --version
8384
RUN g++ --version
8485

85-
USER builduser
86-
WORKDIR /home/builduser
86+
# Github action need root user
87+
# https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
88+
# USER builduser
89+
# WORKDIR /home/builduser

0 commit comments

Comments
 (0)