Skip to content

Commit c086b07

Browse files
Update docker native libs container (elastic#138227)
This commit has a few small fixes for the DockerFiles used to build the simdvec library: 1. ERROR - Replace openjdk-17-jdk with openjdk-21-jdk - some distros have dropped 17. This is just the jdk that runs Gradle. 2. WARNING - Use apt-get to avoid WARNING : apt does not have a stable CLI interface. Use with caution in scripts. 3. WARNING - Fix for warning - JSON arguments recommended for ENTRYPOINT/CMD to prevent unintended behavior related to OS signals 4. Update the gradle wrapper --------- Co-authored-by: Lorenzo Dematte <[email protected]>
1 parent 6b59792 commit c086b07

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM debian:latest
22

3-
RUN apt update
4-
RUN apt install -y gcc g++ openjdk-17-jdk
3+
RUN apt-get update
4+
RUN apt-get install -y gcc g++ openjdk-21-jdk
55
COPY . /workspace
66
WORKDIR /workspace
77
RUN ./gradlew --quiet --console=plain clean buildSharedLibrary
88
RUN strip --strip-unneeded build/output/libvec.so
99

10-
CMD cat build/output/libvec.so
10+
CMD ["cat", "build/output/libvec.so"]
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
FROM debian:latest
22

3-
RUN apt update
4-
RUN apt install -y wget
3+
RUN apt-get update
4+
RUN apt-get install -y wget
55
RUN echo "deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-18 main" > /etc/apt/sources.list.d/clang.list
66
RUN wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
7-
RUN apt update
8-
RUN apt install -y clang-18 openjdk-17-jdk
7+
RUN apt-get update
8+
RUN apt-get install -y clang-18 openjdk-21-jdk
99
RUN ln -s /usr/bin/clang-18 /usr/bin/clang
1010
RUN ln -s /usr/bin/clang++-18 /usr/bin/clang++
1111
COPY . /workspace
1212
WORKDIR /workspace
1313
RUN ./gradlew --quiet --console=plain clean buildSharedLibrary
1414
RUN strip --strip-unneeded build/output/libvec.so
1515

16-
CMD cat build/output/libvec.so
16+
CMD ["cat", "build/output/libvec.so"]
2.13 KB
Binary file not shown.

libs/simdvec/native/gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
45
networkTimeout=10000
56
validateDistributionUrl=true
67
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)