Use container: + image: vs runs-on.

Author: sobomax

.github/workflows/rtpproxy_ci.yml

@@ -30,7 +30,11 @@ jobs:
     needs: LoadJobs_conf
     if: needs.LoadJobs_conf.outputs.do_MinBuild == 'true'
     # The type of runner that the job will run on
-    runs-on: ubuntu-${{ matrix.os }}
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:${{ matrix.os }}
+      options: >-
+        -v sources:/__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
     env:
       COMPILER: ${{ matrix.compiler }}
       TAR_CMD: tar_nosuid
@@ -66,6 +70,11 @@ jobs:
           compiler: 'clang'
 
     steps:
+    - name: Install git
+      run: |
+        apt-get update
+        apt-get install -y git lsb-release gnupg2 wget
+
     - uses: actions/checkout@v6
       with:
         submodules: 'recursive'
@@ -74,14 +83,7 @@ jobs:
       if: endsWith(matrix.compiler, '-cross')
       run: sh -x scripts/build/start_container.sh
 
-    - name: Workaround for tar not being able to access /var/cache/apt/archives
-      if: endsWith(matrix.compiler, '-cross') == 0
-      run: |
-        sudo cp "$(command -v tar)" "$(command -v tar)"_nosuid
-        sudo chmod u+s "$(command -v tar)"
-
     - name: Cache apt-get packages
-      if: endsWith(matrix.compiler, '-cross') == 0
       uses: actions/cache@v5
       with:
         path: /var/cache/apt/archives
@@ -93,12 +95,6 @@ jobs:
     - name: Install apt-get updates
       run: scripts/ft-apt-get-update.sh
 
-    - name: Set up Python
-      if: endsWith(matrix.compiler, '-cross') == 0
-      uses: actions/setup-python@v6
-      with:
-        python-version: 3.9
-
     - name: install_depends
       run: sh -x scripts/build/install_depends.sh
 

scripts/build/build.conf.sub

@@ -32,6 +32,8 @@ then
 	SUDO="sudo"
 fi
 
+PKGS="${PKGS} wget make git pkg-config libtool automake autoconf python3"
+
 case "${COMPILER}" in
 gcc)
 	export CC="${COMPILER}"
@@ -44,7 +46,7 @@ gcc-i386-cross)
 	DOCKR_PLATFORM="x86_64"
 	export BUILD_OS="ubuntu-18.04"
 	PRE_INSTALL_CMD="enable_arch i386"
-	PKGS="${PKGS} wget make git libssl-dev:i386 pkg-config libtool automake autoconf python3 gcc g++ libc6-dev:i386 libstdc++6:i386 lib32gcc-7-dev"
+	PKGS="${PKGS} libssl-dev:i386 gcc g++ libc6-dev:i386 libstdc++6:i386 lib32gcc-7-dev"
 	;;
 gcc-mips64-cross)
 	DOCKR_BASE="ubuntu:18.04"
@@ -54,7 +56,7 @@ gcc-mips64-cross)
 	export AR="mips64-linux-gnuabi64-ar"
 	export RANLIB="mips64-linux-gnuabi64-ranlib"
 	POST_INSTALL_CMD="setup_qemu mips64 gnuabi64"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 gcc-mips64-linux-gnuabi64 libc-dev-mips64-cross qemu-user-static"
+	PKGS="${PKGS} libssl-dev gcc-mips64-linux-gnuabi64 libc-dev-mips64-cross qemu-user-static"
 	;;
 gcc-arm32-cross)
 	export CC="arm-linux-gnueabihf-gcc"
@@ -64,7 +66,7 @@ gcc-arm32-cross)
 	export BUILD_OS="ubuntu-18.04"
 	DOCKR_BASE="ubuntu:18.04"
 	DOCKR_PLATFORM="x86_64"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 gcc-arm-linux-gnueabihf libc-dev-armhf-cross qemu-user-static"
+	PKGS="${PKGS} libssl-dev gcc-arm-linux-gnueabihf libc-dev-armhf-cross qemu-user-static"
 	;;
 gcc-arm64-cross)
 	export CC="aarch64-linux-gnu-gcc"
@@ -74,35 +76,35 @@ gcc-arm64-cross)
 	export BUILD_OS="ubuntu-18.04"
 	DOCKR_BASE="ubuntu:18.04"
 	DOCKR_PLATFORM="x86_64"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 gcc-aarch64-linux-gnu libc-dev-arm64-cross qemu-user-static"
+	PKGS="${PKGS} libssl-dev gcc-aarch64-linux-gnu libc-dev-arm64-cross qemu-user-static"
 	;;
 gcc-arm32-qemu-cross)
 	export CC="/usr/lib/ccache/gcc"
 	export CCACHE_DIR="`pwd`/ccache"
 	DOCKR_BASE="ubuntu"
 	DOCKR_PLATFORM="arm/v7"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 gcc g++ ccache"
+	PKGS="${PKGS} libssl-dev gcc g++ ccache"
 	;;
 clang-arm32-qemu-cross)
 	export CC="/usr/lib/ccache/clang"
 	export CCACHE_DIR="`pwd`/ccache"
 	DOCKR_BASE="ubuntu"
 	DOCKR_PLATFORM="arm/v7"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 clang llvm-dev ccache"
+	PKGS="${PKGS} libssl-dev clang llvm-dev ccache"
         ;;
 gcc-arm64-qemu-cross)
 	export CC="/usr/lib/ccache/gcc"
 	export CCACHE_DIR="`pwd`/ccache"
 	DOCKR_BASE="ubuntu"
 	DOCKR_PLATFORM="arm64/v8"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 gcc g++ ccache"
+	PKGS="${PKGS} libssl-dev gcc g++ ccache"
 	;;
 clang-arm64-qemu-cross)
 	export CC="/usr/lib/ccache/clang"
 	export CCACHE_DIR="`pwd`/ccache"
 	DOCKR_BASE="ubuntu"
 	DOCKR_PLATFORM="arm64/v8"
-	PKGS="${PKGS} wget make git libssl-dev pkg-config libtool automake autoconf python3 clang llvm-dev ccache"
+	PKGS="${PKGS} libssl-dev clang llvm-dev ccache"
 	;;
 clang)
 	export CC="${COMPILER}"
@@ -118,7 +120,7 @@ clang-i386-cross)
 	DOCKR_PLATFORM="x86_64"
 	export BUILD_OS="ubuntu-18.04"
 	PRE_INSTALL_CMD="enable_arch i386"
-	PKGS="${PKGS} wget make git libssl-dev:i386 pkg-config libtool automake autoconf python3 clang llvm-dev libc6-dev:i386 libstdc++6:i386 lib32gcc-7-dev"
+	PKGS="${PKGS} libssl-dev:i386 clang llvm-dev libc6-dev:i386 libstdc++6:i386 lib32gcc-7-dev"
 	;;
 gcc-*)
 	export CC="${COMPILER}"

scripts/build/start_container.sh

@@ -11,7 +11,12 @@ then
   exit 1
 fi
 
-sudo apt-get update
-sudo apt-get install -y qemu-user-static
+if ! docker -v 2>/dev/null
+then
+  ${SUDO} apt-get update
+  ${SUDO} apt-get install -y docker.io
+fi
+docker run --rm --privileged tonistiigi/binfmt:latest -install all
 docker pull ${DOCKR_BASE}
-docker run --cidfile "${DKR_CID_FILE}" -d --restart=always --platform linux/${DOCKR_PLATFORM} -v `pwd`:`pwd` ${DOCKR_BASE} sleep infinity
+docker run --cidfile "${DKR_CID_FILE}" -d --restart=always \
+ --platform linux/${DOCKR_PLATFORM} -v sources:`pwd` ${DOCKR_BASE} sleep infinity

scripts/do-build.sh

@@ -40,6 +40,10 @@ fi
 
 if [ "${TTYPE}" = "cleanbuild" ]
 then
+  if [ -n "${DOCKR_PLATFORM}" ]
+  then
+    CONFIGURE_ARGS="${CONFIGURE_ARGS} --host=${DOCKR_PLATFORM}-pc-linux-gnu"
+  fi
   ./configure ${CONFIGURE_ARGS}
   exec make ${ALLCLEAN_TGT}
 fi