Skip to content

Commit

Permalink
Merge pull request #437 from janvorli/change-cross-alpine-arm-to-3.13
Browse files Browse the repository at this point in the history
Change ubuntu cross arm alpine to use 3.13 rootfs
  • Loading branch information
janvorli committed Apr 9, 2021
2 parents 5d87b80 + 14a5300 commit 19bba5c
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 1 deletion.
12 changes: 12 additions & 0 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,18 @@
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/16.04/cross/arm-alpine",
"os": "linux",
"osVersion": "xenial",
"tags": {
"ubuntu-16.04-cross-arm-alpine-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
}
}
]
},
{
"platforms": [
{
Expand Down
29 changes: 29 additions & 0 deletions src/ubuntu/16.04/cross/arm-alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-crossdeps

# Install bison. This is required to build musl-cross-make
RUN apt-get update \
&& apt-get install -y \
bison \
&& rm -rf /var/lib/apt/lists/*

# Workaround to build a functioning ld.gold which can link for linux-musl arm
RUN cd /tmp \
&& wget https://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.gz \
&& tar -xf binutils-2.31.1.tar.gz \
&& cd binutils-2.31.1 \
&& ./configure \
--disable-werror \
--target=armv7-alpine-linux-musleabihf \
--prefix=/usr \
--libdir=/lib \
--disable-multilib \
--with-sysroot=armv7-alpine-linux-musleabihf \
--enable-gold=yes \
--enable-plugins=yes \
--program-prefix=armv7-alpine-linux-musleabihf- \
&& make \
&& make install \
&& cd .. \
&& rm -r *

ADD rootfs.arm.tar crossrootfs
1 change: 1 addition & 0 deletions src/ubuntu/16.04/cross/arm-alpine/hooks/post-build
5 changes: 5 additions & 0 deletions src/ubuntu/16.04/cross/arm-alpine/hooks/pre-build
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/usr/bin/env sh

SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-16.04 alpine3.13 arm lldb3.9
2 changes: 1 addition & 1 deletion src/ubuntu/18.04/cross/arm-alpine/hooks/pre-build
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-18.04 alpine arm lldb3.9
$SCRIPTPATH/../../../../build-scripts/build-rootfs.sh ubuntu-18.04 alpine3.13 arm lldb3.9

0 comments on commit 19bba5c

Please sign in to comment.