chore: move required system libraries to base dockerfiles

Author: joseluisq

.github/workflows/release-beta.yml

@@ -54,7 +54,7 @@ jobs:
           provenance: false
           context: .
           platforms: linux/amd64
-          file: ./docker/amd64/Dockerfile
+          file: ./docker/amd64/base/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
 
   build-arm64:
@@ -105,7 +105,7 @@ jobs:
           provenance: false
           context: .
           platforms: linux/arm64
-          file: ./docker/arm64/Dockerfile
+          file: ./docker/arm64/base/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
 
   manifest:

docker/amd64/base/Dockerfile

@@ -10,6 +10,19 @@ LABEL version="${VERSION}" \
     description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
     maintainer="Jose Quintana <joseluisq.net>"
 
+RUN set -eux \
+    && dpkg --add-architecture arm64 \
+    && DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+        musl-dev \
+        musl-dev:arm64 \
+        musl-tools \
+        gcc-aarch64-linux-gnu \
+        g++-aarch64-linux-gnu \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
+
 # Static linking for C++ code
 RUN set -eux \
     && ln -s "/usr/bin/g++" "/usr/bin/musl-g++" \

docker/amd64/libs/Dockerfile

@@ -1,18 +1,5 @@
 FROM joseluisq/rust-linux-darwin-builder:v2.0.0-beta.1
 
-RUN set -eux \
-    && dpkg --add-architecture arm64 \
-    && DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-        musl-dev \
-        musl-dev:arm64 \
-        musl-tools \
-        gcc-aarch64-linux-gnu \
-        g++-aarch64-linux-gnu \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && true
-
 # zlib - http://zlib.net/
 ARG ZLIB_VERSION=1.3.1
 # Crate-related environment variables

docker/arm64/base/Dockerfile

@@ -10,6 +10,19 @@ LABEL version="${VERSION}" \
     description="Use same Docker image for compiling Rust programs for Linux (musl libc) & macOS (osxcross)." \
     maintainer="Jose Quintana <joseluisq.net>"
 
+RUN set -eux \
+    && dpkg --add-architecture amd64 \
+    && DEBIAN_FRONTEND=noninteractive apt-get update -qq \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
+        musl-dev \
+        musl-dev:amd64 \
+        musl-tools \
+        gcc-x86-64-linux-gnu \
+        g++-x86-64-linux-gnu \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && true
+
 # Static linking for C++ code
 RUN set -eux \
     && ln -s "/usr/bin/g++" "/usr/bin/musl-g++" \

docker/arm64/libs/Dockerfile

@@ -1,18 +1,5 @@
 FROM joseluisq/rust-linux-darwin-builder:v2.0.0-beta.1
 
-RUN set -eux \
-    && dpkg --add-architecture amd64 \
-    && DEBIAN_FRONTEND=noninteractive apt-get update -qq \
-    && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \
-        musl-dev \
-        musl-dev:amd64 \
-        musl-tools \
-        gcc-x86-64-linux-gnu \
-        g++-x86-64-linux-gnu \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
-    && true
-
 # zlib - http://zlib.net/
 ARG ZLIB_VERSION=1.3.1
 # Crate-related environment variables