Skip to content

Commit 1d0e771

Browse files
committed
Fix strip & Add missing stripped libraries
1 parent 3acfdae commit 1d0e771

File tree

12 files changed

+34
-67
lines changed

12 files changed

+34
-67
lines changed

Dockerfile

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,15 @@
1-
FROM --platform=amd64 rust AS build_community
2-
RUN apt-get update
3-
RUN apt-get -y install clang
4-
RUN mkdir /build
5-
WORKDIR /build
6-
ENV LIBCLANG_PATH=/usr/lib/llvm-11/lib/
7-
ADD Cargo.toml Cargo.toml
8-
ADD build.rs build.rs
9-
ADD libcblite_community libcblite_community
10-
ADD src src
11-
RUN cargo c
12-
RUN cargo test --features=community -- --test-threads=1
13-
14-
FROM --platform=amd64 rust AS build_enterprise
15-
RUN apt-get update
16-
RUN apt-get -y install clang
17-
RUN mkdir /build
18-
WORKDIR /build
19-
ENV LIBCLANG_PATH=/usr/lib/llvm-11/lib/
20-
ADD Cargo.toml Cargo.toml
21-
ADD build.rs build.rs
22-
ADD libcblite_enterprise libcblite_enterprise
23-
ADD src src
24-
RUN cargo c
25-
RUN cargo test --features=enterprise -- --test-threads=1
26-
27-
FROM --platform=amd64 rust AS strip-stage_community
28-
RUN apt-get update
29-
RUN apt-get -y install binutils binutils-aarch64-linux-gnu
30-
RUN mkdir /build
31-
WORKDIR /build
32-
ADD libcblite_community libcblite_community
33-
RUN strip /build/libcblite_community/lib/x86_64-linux-android/libcblite.so -o /build/libcblite_community/lib/x86_64-linux-android/libcblite.stripped.so
34-
RUN strip /build/libcblite_community/lib/i686-linux-android/libcblite.so -o /build/libcblite_community/lib/i686-linux-android/libcblite.stripped.so
35-
RUN /usr/aarch64-linux-gnu/bin/strip /build/libcblite_community/lib/aarch64-linux-android/libcblite.so -o /build/libcblite_community/lib/aarch64-linux-android/libcblite.stripped.so
36-
RUN /usr/aarch64-linux-gnu/bin/strip /build/libcblite_community/lib/arm-linux-androideabi/libcblite.so -o /build/libcblite_community/lib/arm-linux-androideabi/libcblite.stripped.so
37-
RUN strip /build/libcblite_community/lib/x86_64-pc-windows-gnu/cblite.dll -o /build/libcblite_community/lib/x86_64-pc-windows-gnu/cblite.stripped.dll
38-
39-
FROM --platform=amd64 rust AS strip-stage_enterprise
1+
FROM --platform=amd64 rust AS strip-stage
2+
ARG DIRNAME
403
RUN apt-get update
414
RUN apt-get -y install binutils binutils-aarch64-linux-gnu
425
RUN mkdir /build
436
WORKDIR /build
44-
ADD libcblite_enterprise libcblite_enterprise
45-
RUN strip /build/libcblite_enterprise/lib/x86_64-linux-android/libcblite.so -o /build/libcblite_enterprise/lib/x86_64-linux-android/libcblite.stripped.so
46-
RUN strip /build/libcblite_enterprise/lib/i686-linux-android/libcblite.so -o /build/libcblite_enterprise/lib/i686-linux-android/libcblite.stripped.so
47-
RUN /usr/aarch64-linux-gnu/bin/strip /build/libcblite_enterprise/lib/aarch64-linux-android/libcblite.so -o /build/libcblite_enterprise/lib/aarch64-linux-android/libcblite.stripped.so
48-
RUN /usr/aarch64-linux-gnu/bin/strip /build/libcblite_enterprise/lib/arm-linux-androideabi/libcblite.so -o /build/libcblite_enterprise/lib/arm-linux-androideabi/libcblite.stripped.so
49-
RUN strip /build/libcblite_enterprise/lib/x86_64-pc-windows-gnu/cblite.dll -o /build/libcblite_enterprise/lib/x86_64-pc-windows-gnu/cblite.stripped.dll
7+
ADD ${DIRNAME} ${DIRNAME}
8+
RUN strip /build/${DIRNAME}/lib/x86_64-linux-android/libcblite.so -o /build/${DIRNAME}/lib/x86_64-linux-android/libcblite.stripped.so
9+
RUN strip /build/${DIRNAME}/lib/i686-linux-android/libcblite.so -o /build/${DIRNAME}/lib/i686-linux-android/libcblite.stripped.so
10+
RUN /usr/aarch64-linux-gnu/bin/strip /build/${DIRNAME}/lib/aarch64-linux-android/libcblite.so -o /build/${DIRNAME}/lib/aarch64-linux-android/libcblite.stripped.so
11+
RUN /usr/aarch64-linux-gnu/bin/strip /build/${DIRNAME}/lib/arm-linux-androideabi/libcblite.so -o /build/${DIRNAME}/lib/arm-linux-androideabi/libcblite.stripped.so
12+
RUN strip /build/${DIRNAME}/lib/x86_64-pc-windows-gnu/cblite.dll -o /build/${DIRNAME}/lib/x86_64-pc-windows-gnu/cblite.stripped.dll
5013

51-
FROM scratch AS strip
52-
COPY --from=strip-stage_community /build/libcblite_community/ .
53-
COPY --from=strip-stage_enterprise /build/libcblite_enterprise/ .
14+
FROM scratch AS strip
15+
COPY --from=strip-stage /build/${DIRNAME}/ .
4.38 MB
Binary file not shown.
2.83 MB
Binary file not shown.
4.52 MB
Binary file not shown.
4.48 MB
Binary file not shown.
4.24 MB
Binary file not shown.
4.53 MB
Binary file not shown.
2.93 MB
Binary file not shown.
4.68 MB
Binary file not shown.
4.63 MB
Binary file not shown.

0 commit comments

Comments
 (0)