Update after upstream changes

Author: jeanp413

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [bionic-x64, buster-arm64, buster-armhf, centos7-devtoolset8-x64, centos7-devtoolset8-arm64]
+        arch: [focal-x64, bionic-arm64, bionic-armhf, centos7-devtoolset8-x64, centos7-devtoolset8-arm64]
         include:
         - arch: centos7-devtoolset8-arm64
           qemu: true

bionic-arm64/Dockerfile

@@ -1,4 +1,4 @@
-ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
+ARG REPO=ubuntu
 ARG TAG=18.04
 FROM ${REPO}:${TAG}
 
@@ -30,7 +30,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libsecret-1-dev:arm64 \
   curl \
   gnupg \
-  unzip
+  unzip \
+  jq
 
 # Set python3 as default
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
@@ -47,4 +48,4 @@ ENV AS=/usr/bin/aarch64-linux-gnu-as \
   CPP=/usr/bin/aarch64-linux-gnu-cpp-8 \
   CXX=/usr/bin/aarch64-linux-gnu-g++-8 \
   LD=/usr/bin/aarch64-linux-gnu-ld \
-  PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
+  PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig

bionic-armhf/Dockerfile

@@ -1,4 +1,4 @@
-ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
+ARG REPO=ubuntu
 ARG TAG=18.04
 FROM ${REPO}:${TAG}
 
@@ -30,7 +30,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   libsecret-1-dev:armhf \
   curl \
   gnupg \
-  unzip
+  unzip \
+  jq
 
 # Set python3 as default
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 1
@@ -47,4 +48,4 @@ ENV AS=/usr/bin/arm-linux-gnueabihf-as \
   CPP=/usr/bin/arm-linux-gnueabihf-cpp-8 \
   CXX=/usr/bin/arm-linux-gnueabihf-g++-8 \
   LD=/usr/bin/arm-linux-gnueabihf-ld \
-  PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
+  PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig

focal-x64/Dockerfile

@@ -1,4 +1,4 @@
-ARG REPO=mcr.microsoft.com/mirror/docker/library/ubuntu
+ARG REPO=ubuntu
 ARG TAG=20.04
 FROM ${REPO}:${TAG}
 
@@ -44,6 +44,7 @@ RUN apt-get update && apt-get install -y \
     xvfb \
     tzdata \
     unzip \
+    jq \
   && curl https://chromium.googlesource.com/chromium/src/+/HEAD/build/install-build-deps.sh\?format\=TEXT | base64 --decode | cat > /setup/install-build-deps.sh \
   && curl https://chromium.googlesource.com/chromium/src/+/HEAD/build/install-build-deps.py\?format\=TEXT | base64 --decode | cat > /setup/install-build-deps.py \
   # Remove snapcraft to avoid issues on docker build
@@ -82,5 +83,7 @@ RUN sudo mkdir -p /var/run/dbus
 RUN gcc --version
 RUN g++ --version
 
-USER builduser
-WORKDIR /home/builduser
+# Github action need root user
+# https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions#user
+# USER builduser
+# WORKDIR /home/builduser