Update Docker files

Author: botder

.github/workflows/dockerimage.yaml

@@ -8,11 +8,7 @@ on:
     paths: 
     - '.github/workflows/build.yaml'
     - '.github/workflows/dockerimage.yaml'
-    - 'utils/compat/**'
-    - 'Dockerfile'
-    - 'Dockerfile.i386'
-    - 'Dockerfile.armhf'
-    - 'Dockerfile.arm64'
+    - '/utils/docker/**'
 
 jobs:
   build:
@@ -40,5 +36,5 @@ jobs:
     - uses: docker/build-push-action@v5
       with:
         push: true
-        file: ./${{ matrix.dockerfile }}
-        tags: ghcr.io/multitheftauto/mtasa-blue-build:${{ matrix.tag }}
+        file: ./utils/docker/Dockerfile
+        tags: ghcr.io/multitheftauto/mtasa-blue-build:latest

Dockerfile

@@ -4,6 +4,7 @@
 : ${BUILD_OS:=linux}
 : ${BUILD_ARCHITECTURE:=x64}
 : ${BUILD_CONFIG:=release}
+: ${PREMAKE_FILE:=premake5.lua}
 
 # Find premake binary location
 if [ "$(uname)" == "Darwin" ]; then
@@ -25,6 +26,8 @@ while [ $# -gt 0 ]; do
         --os=*)     BUILD_OS="${1#*=}"              ;;
         --arch=*)   BUILD_ARCHITECTURE="${1#*=}"    ;;
         --config=*) BUILD_CONFIG="${1#*=}"          ;;
+        --cores=*)  NUM_CORES="${1#*=}"             ;;
+        --file=*)   PREMAKE_FILE="${1#*=}"          ;;
         *)
             echo "Error: Invalid argument: $1" >&2
             exit 1
@@ -48,12 +51,31 @@ esac
 case $BUILD_ARCHITECTURE in
     32|x86)
         CONFIG=${BUILD_CONFIG}_x86
+        : ${GCC_PREFIX:=i386-linux-gnu-}
+        : ${AR:=x86_64-linux-gnu-gcc-ar-10}
+        : ${CC:=x86_64-linux-gnu-gcc-10}
+        : ${CXX:=x86_64-linux-gnu-g++-10}
     ;;
     64|x64)
         CONFIG=${BUILD_CONFIG}_x64
+        : ${GCC_PREFIX:=x86_64-linux-gnu-}
+        : ${AR:=x86_64-linux-gnu-gcc-ar-10}
+        : ${CC:=x86_64-linux-gnu-gcc-10}
+        : ${CXX:=x86_64-linux-gnu-g++-10}
     ;;
-    arm64|arm)
+    arm)
         CONFIG=${BUILD_CONFIG}_${BUILD_ARCHITECTURE}
+        : ${GCC_PREFIX:=arm-linux-gnueabihf-}
+        : ${AR:=arm-linux-gnueabihf-ar}
+        : ${CC:=arm-linux-gnueabihf-gcc-10}
+        : ${CXX:=arm-linux-gnueabihf-g++-10}
+    ;;
+    arm64)
+        CONFIG=${BUILD_CONFIG}_${BUILD_ARCHITECTURE}
+        : ${GCC_PREFIX:=aarch64-linux-gnu-}
+        : ${AR:=aarch64-linux-gnu-gcc-ar-10}
+        : ${CC:=aarch64-linux-gnu-gcc-10}
+        : ${CXX:=aarch64-linux-gnu-g++-10}
     ;;
     *)
         echo "Error: Invalid build architecture" >&2
@@ -62,19 +84,19 @@ esac
 
 echo "  OS = $BUILD_OS"
 echo "  CONFIG = $CONFIG"
-echo "  AR = ${AR:=ar}"
-echo "  CC = ${CC:=gcc}"
-echo "  CXX = ${CXX:=g++}"
+echo "  AR = $AR"
+echo "  CC = $CC"
+echo "  CXX = $CXX"
 
 # Clean old build files
 rm -Rf Build/
 rm -Rf Bin/
 
 # Generate Makefiles
 if [[ -n "$GCC_PREFIX" ]]; then
-    $PREMAKE5 --gccprefix="$GCC_PREFIX" --os="$BUILD_OS" gmake
+    $PREMAKE5 --gccprefix="$GCC_PREFIX" --os="$BUILD_OS" --file=$PREMAKE_FILE gmake
 else
-    $PREMAKE5 --os="$BUILD_OS" gmake
+    $PREMAKE5 --os="$BUILD_OS" --file=$PREMAKE_FILE gmake
 fi
 
 # Build!

Dockerfile.arm64

@@ -0,0 +1,71 @@
+FROM ubuntu:focal
+
+ENV LC_ALL=C.UTF-8 \
+    LANG=C.UTF-8 \
+    LANGUAGE=C.UTF-8 \
+    GLIBC_COMPAT=true
+
+# Trust the signing key for "PPA for Ubuntu Toolchain Uploads".
+# Source: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2c277a0a352154e5
+COPY ubuntu-toolchain-r-ubuntu-test.asc  /etc/apt/trusted.gpg.d/
+
+# Use a combined APT sources list for amd64, i386, armhf, arm64, and PPA for Ubuntu Toolchain Uploads.
+COPY sources.list  /etc/apt/sources.list
+
+# 1. Add the supported architectures.
+# 2. Install all compilers and build-time dependencies (libncurses, libmysqlclient) for every architecture.
+# 3. Manually download, modify, and install libmysqlclient-dev, because it can't be installed in parallel.
+# 4. Remove cache and temporary files.
+RUN    dpkg --add-architecture i386  \
+    && dpkg --add-architecture armhf \
+    && dpkg --add-architecture arm64 \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends make  \
+        libncurses-dev:arm64 libmysqlclient21:arm64 zlib1g-dev:arm64 libssl-dev:arm64 g++-10-arm-linux-gnueabihf \
+        libncurses-dev:armhf libmysqlclient21:armhf zlib1g-dev:armhf libssl-dev:armhf g++-10-aarch64-linux-gnu   \
+        libncurses-dev:i386  libmysqlclient21:i386  zlib1g-dev:i386  libssl-dev:i386  g++-10-multilib            \
+        libncurses-dev       libmysqlclient21       zlib1g-dev       libssl-dev                                  \
+    && apt-get upgrade -y
+    && cd /tmp \
+    && apt-get download \
+        libmysqlclient-dev:armhf \
+        libmysqlclient-dev:arm64 \
+        libmysqlclient-dev:i386  \
+        libmysqlclient-dev       \
+    && dpkg-deb -R libmysqlclient-dev_*_armhf.deb libmysqlclient-dev-armhf \
+    && dpkg-deb -R libmysqlclient-dev_*_arm64.deb libmysqlclient-dev-arm64 \
+    && dpkg-deb -R libmysqlclient-dev_*_i386.deb  libmysqlclient-dev-i386  \
+    && dpkg-deb -R libmysqlclient-dev_*_amd64.deb libmysqlclient-dev-amd64 \
+    && echo 'Multi-Arch: same' | tee -a \
+        libmysqlclient-dev-amd64/DEBIAN/control \
+        libmysqlclient-dev-i386/DEBIAN/control  \
+        libmysqlclient-dev-armhf/DEBIAN/control \
+        libmysqlclient-dev-arm64/DEBIAN/control \
+    && dpkg-deb -b libmysqlclient-dev-amd64 libmysqlclient-dev-amd64.deb \
+    && dpkg-deb -b libmysqlclient-dev-i386  libmysqlclient-dev-i386.deb  \
+    && dpkg-deb -b libmysqlclient-dev-armhf libmysqlclient-dev-armhf.deb \
+    && dpkg-deb -b libmysqlclient-dev-arm64 libmysqlclient-dev-arm64.deb \
+    && dpkg -i --force-overwrite \
+        libmysqlclient-dev-armhf.deb \
+        libmysqlclient-dev-arm64.deb \
+        libmysqlclient-dev-i386.deb  \
+        libmysqlclient-dev-amd64.deb \
+    && rm -rf /tmp/* /var/lib/apt/lists/*
+
+# Downgrade glibc symbols for backwards compatibility.
+COPY compat /compat
+
+RUN mkdir -p /compat/x64 /compat/x86 \
+    && objcopy --redefine-syms=/compat/glibc_version_x64.redef "$(gcc-10 --print-file-name=libstdc++.a)"      /compat/x64/libstdc++.a      \
+    && objcopy --redefine-syms=/compat/glibc_version_x64.redef /usr/lib/x86_64-linux-gnu/libmysqlclient.a     /compat/x64/libmysqlclient.a \
+    && objcopy --redefine-syms=/compat/glibc_version_x86.redef "$(gcc-10 -m32 --print-file-name=libstdc++.a)" /compat/x86/libstdc++.a      \
+    && objcopy --redefine-syms=/compat/glibc_version_x86.redef /usr/lib/i386-linux-gnu/libmysqlclient.a       /compat/x86/libmysqlclient.a
+
+VOLUME  /build
+WORKDIR /build
+
+COPY docker-entrypoint.sh  /docker-entrypoint.sh
+
+RUN chmod +x /docker-entrypoint.sh
+
+ENTRYPOINT bash /docker-entrypoint.sh