fix build debian 8

vesoft-inc · Jun 3, 2021 · f9e159d · f9e159d
1 parent 4820f2a
commit f9e159d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/docker/build/Makefile b/docker/build/Makefile
@@ -1,9 +1,5 @@
 arch=$(shell uname -m)
-ifeq ($(arch),aarch64)
-	tags=centos-7 debian-9
-else
-	tags=centos-7 debian-8
-endif
+tags=centos-7 debian-8
 
 all: $(tags)
 print:

diff --git a/docker/images/Makefile b/docker/images/Makefile
@@ -1,9 +1,5 @@
 arch=$(shell uname -m)
-ifeq ($(arch),aarch64)
-	tags=centos-7 debian-9
-else
-	tags=centos-7 debian-8
-endif
+tags=centos-7 debian-8
 
 all: $(tags)
 print:

diff --git a/docker/images/aarch64/debian-9.Dockerfile → docker/images/aarch64/debian-8.Dockerfile b/docker/images/aarch64/debian-9.Dockerfile → docker/images/aarch64/debian-8.Dockerfile
@@ -1,5 +1,6 @@
-FROM arm64v8/debian:9
+FROM arm64v8/debian:8
 SHELL ["/bin/bash", "-c"]
+RUN echo "deb http://archive.debian.org/debian/ jessie main contrib non-free" > /etc/apt/sources.list
 RUN apt-get update
 RUN apt-get install -y make \
                        git \
@@ -23,7 +24,7 @@ RUN apt-get install -y make \
                        flex \
                        gperf \
                        gettext --force-yes
-RUN apt-get install -y pxz
+RUN apt-get install -y pxz --force-yes
 
 ENV NG_URL=https://raw.githubusercontent.com/vesoft-inc/nebula-gears/master/install
 ENV OSS_UTIL_URL='https://gosspublic.alicdn.com/ossutil/1.7.0/ossutilarm64?spm=a2c63.p38356.879954.15.c0942454HuAZDI'

diff --git a/scripts/install-gcc b/scripts/install-gcc
@@ -72,7 +72,7 @@ then
 elif [[ $this_arch = 'aarch64' ]]
 then
     CentOS_libc_preset=( 2.17 )
-    Debian_libc_preset=( 2.24 )
+    Debian_libc_preset=( 2.19 )
 else
     echo "Architecture $this_arch is not supported" 1>&2
     exit 1

diff --git a/scripts/install-llvm b/scripts/install-llvm
@@ -65,7 +65,7 @@ then
 elif [[ $this_arch = 'aarch64' ]]
 then
     CentOS_libc_preset=( 2.17 )
-    Debian_libc_preset=( 2.24 )
+    Debian_libc_preset=( 2.19 )
 else
     echo "Architecture $this_arch is not supported" 1>&2
     exit 1