diff --git a/Dockerfile.builder.linux-amd64-static b/Dockerfile.builder.linux-amd64-static index 1d7dd37a7..cc99f17f7 100644 --- a/Dockerfile.builder.linux-amd64-static +++ b/Dockerfile.builder.linux-amd64-static @@ -1,23 +1,18 @@ FROM debian:11 -RUN apt-get update -y &&\ - apt-get install --force-yes -y build-essential libz-dev zlib1g-dev curl - -ARG RESULT_LIB="/musl" - -RUN mkdir ${RESULT_LIB} && \ - curl -L -o musl.tar.gz https://more.musl.cc/10.2.1/x86_64-linux-musl/x86_64-linux-musl-native.tgz && \ - tar -xvzf musl.tar.gz -C musl --strip-components 1 && \ - cp /usr/lib/gcc/x86_64-linux-gnu/10/libstdc++.a ${RESULT_LIB}/lib/ - -ENV CC=/musl/bin/gcc - -RUN curl -L -o zlib.tar.gz https://www.zlib.net/fossils/zlib-1.2.11.tar.gz && \ - mkdir zlib && tar -xvzf zlib.tar.gz -C zlib --strip-components 1 && \ - cd zlib && ./configure --static --prefix=/musl && \ - make && make install && \ - cd / && rm -rf /zlib && rm -f /zlib.tar.gz - +RUN apt-get update -y && \ + apt-get install -y --no-install-recommends \ + build-essential \ + musl \ + musl-dev \ + musl-tools \ + zlib1g-dev \ + curl \ + ca-certificates \ + && rm -rf /var/lib/apt/lists/* + +RUN musl-gcc -v +ENV CC=musl-gcc ENV PATH="$PATH:/musl/bin" ENV GRAALVM_URL='https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz' diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index a90929036..732be7720 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,6 @@ +## 5.0.1 +* Refactoring Linux amd64 static build to work on Github Actions + ## 5.0.0 * Refactoring config module to support config v3 * Activating Config v3 for beta testing diff --git a/gradle.properties b/gradle.properties index 675fc191b..32529aa29 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=5.0.0-snapshot +version=5.0.1-snapshot