-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(docker): make Linux container multi-arch
Signed-off-by: AtomicFS <[email protected]>
- Loading branch information
Showing
1 changed file
with
12 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,9 +35,6 @@ RUN apt-get update && \ | |
| g++-${GCC_VERSION} \ | ||
| gawk \ | ||
| gcc-${GCC_VERSION} \ | ||
| gcc-${GCC_VERSION}-aarch64-linux-gnu \ | ||
| gcc-${GCC_VERSION}-arm-linux-gnueabi \ | ||
| gcc-${GCC_VERSION}-i686-linux-gnu \ | ||
| git \ | ||
| gnupg2 \ | ||
| libelf-dev \ | ||
|
|
@@ -51,6 +48,13 @@ RUN apt-get update && \ | |
| openssl \ | ||
| wget \ | ||
| && \ | ||
| arch="$(dpkg --print-architecture)" && arch="${arch##*-}"; \ | ||
| if [ "${arch}" = 'amd64' ]; then \ | ||
| apt-get install -y --no-install-recommends \ | ||
| gcc-${GCC_VERSION}-aarch64-linux-gnu \ | ||
| gcc-${GCC_VERSION}-arm-linux-gnueabi \ | ||
| gcc-${GCC_VERSION}-i686-linux-gnu; \ | ||
| fi; \ | ||
| apt-get install -y --no-install-recommends \ | ||
| less \ | ||
| nano \ | ||
|
|
@@ -62,9 +66,11 @@ RUN apt-get update && \ | |
| && \ | ||
| update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 100 && \ | ||
| update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 && \ | ||
| update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-${GCC_VERSION} 100 && \ | ||
| update-alternatives --install /usr/bin/arm-linux-gnueabi-gcc arm-linux-gnueabi-gcc /usr/bin/arm-linux-gnueabi-gcc-${GCC_VERSION} 100 && \ | ||
| update-alternatives --install /usr/bin/i686-linux-gnu-gcc i686-linux-gnu-gcc /usr/bin/i686-linux-gnu-gcc-${GCC_VERSION} 100 && \ | ||
| if [ "${arch}" = 'amd64' ]; then \ | ||
| update-alternatives --install /usr/bin/aarch64-linux-gnu-gcc aarch64-linux-gnu-gcc /usr/bin/aarch64-linux-gnu-gcc-${GCC_VERSION} 100 && \ | ||
| update-alternatives --install /usr/bin/arm-linux-gnueabi-gcc arm-linux-gnueabi-gcc /usr/bin/arm-linux-gnueabi-gcc-${GCC_VERSION} 100 && \ | ||
| update-alternatives --install /usr/bin/i686-linux-gnu-gcc i686-linux-gnu-gcc /usr/bin/i686-linux-gnu-gcc-${GCC_VERSION} 100; \ | ||
| fi; \ | ||
| gpg2 --locate-keys [email protected] [email protected] && \ | ||
| rm -rf /var/lib/apt/lists/* | ||
|
|
||
|
|
||