This is an automated email from the ASF dual-hosted git repository.
william pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/main by this push:
new 92ee6f301 ORC-1279: Update the cmake version in ubuntu18 dockerfile to
latest
92ee6f301 is described below
commit 92ee6f3016c2de9fd62bcc64fdb51b0935d4cc56
Author: deshanxiao <[email protected]>
AuthorDate: Tue Sep 27 16:24:03 2022 -0700
ORC-1279: Update the cmake version in ubuntu18 dockerfile to latest
### What changes were proposed in this pull request?
Update cmake of ubuntu18 to latest.
### Why are the changes needed?
[add_compile_definitions
](https://cmake.org/cmake/help/latest/command/add_compile_definitions.html)only
supprt cmake 3.12+. But the default image of ubuntu18 only support cmake 3.10.
We should upgrade it.
### How was this patch tested?
Existing UT
Closes #1260 from deshanxiao/deshan/update-cmake.
Lead-authored-by: deshanxiao <[email protected]>
Co-authored-by: deshanxiao <[email protected]>
Signed-off-by: William Hyun <[email protected]>
---
docker/ubuntu18/Dockerfile | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu18/Dockerfile
index 3e6a65ca6..cc22dc189 100644
--- a/docker/ubuntu18/Dockerfile
+++ b/docker/ubuntu18/Dockerfile
@@ -24,7 +24,6 @@ ARG jdk=8
RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime
RUN apt-get update
RUN apt-get install -y \
- cmake \
gcc \
g++ \
git \
@@ -34,10 +33,19 @@ RUN apt-get install -y \
curl \
maven \
openjdk-${jdk}-jdk \
- tzdata
+ tzdata \
+ wget \
+ software-properties-common
+
RUN update-alternatives --set java $(update-alternatives --list java | grep
${jdk}) && \
update-alternatives --set javac $(update-alternatives --list javac | grep
${jdk})
+# Install latest cmake
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc
2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg
>/dev/null
+RUN apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
+RUN apt update
+RUN apt install -y cmake
+
WORKDIR /root
VOLUME /root/.m2/repository
