musl
This commit is contained in:
parent
34bbea0204
commit
798ec2e3d4
4 changed files with 16 additions and 3 deletions
|
|
@ -192,7 +192,7 @@ jobs:
|
||||||
command: |
|
command: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install gcc g++ zlib1g-dev
|
sudo apt-get -y install gcc g++ zlib1g-dev
|
||||||
sudo .circleci/script/setup-musl
|
sudo -E script/setup-musl
|
||||||
- run:
|
- run:
|
||||||
name: Download GraalVM
|
name: Download GraalVM
|
||||||
command: |
|
command: |
|
||||||
|
|
@ -372,7 +372,7 @@ jobs:
|
||||||
command: |
|
command: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install gcc g++ zlib1g-dev
|
sudo apt-get -y install gcc g++ zlib1g-dev
|
||||||
sudo -E .circleci/script/setup-musl
|
# sudo -E script/setup-musl
|
||||||
- run:
|
- run:
|
||||||
name: Download GraalVM
|
name: Download GraalVM
|
||||||
command: |
|
command: |
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,18 @@
|
||||||
# The one available in stable and testing are quite outdated and this ensures we get the latest improvements
|
# The one available in stable and testing are quite outdated and this ensures we get the latest improvements
|
||||||
# This explictly installs musl from unstable and keeps the others at a higher priority
|
# This explictly installs musl from unstable and keeps the others at a higher priority
|
||||||
|
|
||||||
|
if [ "$BABASHKA_STATIC" != "true" ]
|
||||||
|
then
|
||||||
|
echo "BABASHKA_STATIC wasn't set, skipping musl installation."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$BABASHKA_ARCH" = "aarch64" ]
|
||||||
|
then
|
||||||
|
echo "GraalVM only supports musl on x86_64"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
cat >> /etc/apt/sources.list <<eof
|
cat >> /etc/apt/sources.list <<eof
|
||||||
deb http://ftp.us.debian.org/debian unstable main non-free contrib
|
deb http://ftp.us.debian.org/debian unstable main non-free contrib
|
||||||
deb http://non-us.debian.org/debian-non-us unstable/non-us main contrib non-free
|
deb http://non-us.debian.org/debian-non-us unstable/non-us main contrib non-free
|
||||||
|
|
|
||||||
|
|
@ -54,6 +54,7 @@ ENV BABASHKA_STATIC=$BABASHKA_STATIC
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN ./script/uberjar
|
RUN ./script/uberjar
|
||||||
RUN ./script/compile
|
RUN ./script/compile
|
||||||
|
RUN ./script/setup-musl
|
||||||
|
|
||||||
FROM ubuntu:latest
|
FROM ubuntu:latest
|
||||||
RUN apt-get update && apt-get install -y curl \
|
RUN apt-get update && apt-get install -y curl \
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ args=( "-jar" "$BABASHKA_JAR"
|
||||||
|
|
||||||
BABASHKA_STATIC=${BABASHKA_STATIC:-}
|
BABASHKA_STATIC=${BABASHKA_STATIC:-}
|
||||||
|
|
||||||
if [ "$BABASHKA_STATIC" = "true" ]; then
|
if [ "$BABASHKA_STATIC" = "true" ] & [ "$BABASHKA_ARCH" != "aarch64" ]; then
|
||||||
args+=("--static" "--libc=musl"
|
args+=("--static" "--libc=musl"
|
||||||
# see https://github.com/oracle/graal/issues/3398
|
# see https://github.com/oracle/graal/issues/3398
|
||||||
"-H:CCompilerOption=-Wl,-z,stack-size=2097152")
|
"-H:CCompilerOption=-Wl,-z,stack-size=2097152")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue