update cross

divagant-martian · Sep 6, 2022 · 8462807 · 8462807
1 parent 166a3cd
commit 8462807
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/Cross.toml b/Cross.toml
@@ -1,5 +1,5 @@
 [target.x86_64-unknown-linux-gnu]
-pre-build = ["apt-get install -y cmake clang-3.9"]
+dockerfile = './scripts/cross/x86_64-unknown-linux-gnu.dockerfile'
 
 [target.aarch64-unknown-linux-gnu]
-pre-build = ["apt-get install -y cmake clang-3.9"]
+dockerfile = './scripts/cross/aarch64-unknown-linux-gnu.dockerfile'
diff --git a/scripts/cross/aarch64-unknown-linux-gnu.dockerfile b/scripts/cross/aarch64-unknown-linux-gnu.dockerfile
@@ -0,0 +1,14 @@
+ARG CROSS_BASE_IMAGE
+FROM $CROSS_BASE_IMAGE
+
+RUN apt-get update -y && apt-get upgrade -y
+
+RUN apt-get install -y unzip && \
+    PB_REL="https://github.com/protocolbuffers/protobuf/releases" && \
+    curl -L $PB_REL/download/v3.15.8/protoc-3.15.8-linux-aarch_64.zip -o protoc.zip && \
+    unzip protoc.zip -d /usr && \
+    chmod +x /usr/bin/protoc
+
+RUN apt-get install -y cmake clang-3.9
+
+ENV PROTOC=/usr/bin/protoc
diff --git a/scripts/cross/x86_64-unknown-linux-gnu.dockerfile b/scripts/cross/x86_64-unknown-linux-gnu.dockerfile
@@ -0,0 +1,14 @@
+ARG CROSS_BASE_IMAGE
+FROM $CROSS_BASE_IMAGE
+
+RUN apt-get update -y && apt-get upgrade -y
+
+RUN apt-get install -y unzip && \
+    PB_REL="https://github.com/protocolbuffers/protobuf/releases" && \
+    curl -L $PB_REL/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip -o protoc.zip && \
+    unzip protoc.zip -d /usr && \
+    chmod +x /usr/bin/protoc
+
+RUN apt-get install -y cmake clang-3.9
+
+ENV PROTOC=/usr/bin/protoc