#496: Fixing aarch binary not building (#497)

* upgrading aarch64 builder image * [Gradle Release Plugin] - new version commit: '3.21.3-snapshot'. * adjusting deps * debian deps only worked on debian 11
mageddo · Jun 25, 2024 · 3d4fcd4 · 3d4fcd4
1 parent 9768116
commit 3d4fcd4
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/Dockerfile.builder.linux-aarch64 b/Dockerfile.builder.linux-aarch64
@@ -1,10 +1,8 @@
-FROM arm64v8/debian:9-slim
-
-COPY ./src/main/docker/builder/sources.list /etc/apt/sources.list
+FROM arm64v8/debian:11-slim
 
 RUN apt-get update -y &&\
-  apt-get install --force-yes -y zlib1g-dev=1:1.2.8.dfsg-5 zlib1g=1:1.2.8.dfsg-5 &&\
-  apt-get install --force-yes -y build-essential libz-dev curl
+  apt-get install --force-yes -y build-essential curl &&\
+  apt-get install --force-yes -y libz-dev zlib1g-dev zlib1g
 
 ENV GRAALVM_URL='https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-aarch64_bin.tar.gz'
 RUN mkdir /graalvm &&\

diff --git a/Dockerfile.builder.linux-amd64 b/Dockerfile.builder.linux-amd64
@@ -1,6 +1,6 @@
 FROM debian:9-slim
 
-COPY ./src/main/docker/builder/sources.list /etc/apt/sources.list
+COPY ./src/main/docker/builder-amd64/sources.list /etc/apt/sources.list
 
 RUN apt-get update -y &&\
   apt-get install --force-yes -y zlib1g-dev=1:1.2.8.dfsg-5 zlib1g=1:1.2.8.dfsg-5 &&\

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,6 @@
+## 3.21.3
+* #496: Fixing aarch binary not building 
+
 ## 3.21.2
 * #285, #494: Fixing amd64 static docker image.
 * #435: Make DPS dynamic linked binary compatible with libgc 2.15 again

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=3.21.2-snapshot
+version=3.21.3-snapshot
diff --git a/src/main/docker/builder/sources.list → src/main/docker/builder-amd64/sources.list b/src/main/docker/builder/sources.list → src/main/docker/builder-amd64/sources.list