Skip to content

Commit

Permalink
Replace cmake v3.15 with v3.12 in qgis3-build-deps.dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
mrylov committed Dec 8, 2020
1 parent dff914b commit 5becdd9
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .docker/qgis3-build-deps.dockerfile
Expand Up @@ -155,13 +155,13 @@ RUN curl -v -j -k -L -H "Cookie: eula_3_1_agreed=tools.hana.ondemand.com/develop
&& rm -rf client \
&& rm hanaclient*
ENV PATH="/usr/sap/hdbclient:${PATH}"
# Install cmake version 3.15 required by odbc-cpp-wrapper
RUN curl -LJO https://github.com/Kitware/CMake/releases/download/v3.15.2/cmake-3.15.2-Linux-x86_64.tar.gz \
&& tar -xvf cmake-3.15.2-Linux-x86_64.tar.gz && cp cmake-3.15.2-Linux-x86_64/bin/cmake /usr/local/bin \
&& mkdir -p /usr/local/share/cmake-3.15 \
&& cp -r cmake-3.15.2-Linux-x86_64/share/cmake-3.15/* /usr/local/share/cmake-3.15 \
&& rm -rf cmake-3.15.2-Linux-x86_64*
# Download and compile odbc-cpp-wrapper
# Install cmake version 3.12 required by odbc-cpp-wrapper
RUN curl -LJO https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.tar.gz \
&& tar -xvf cmake-3.12.4-Linux-x86_64.tar.gz && cp cmake-3.12.4-Linux-x86_64/bin/cmake /usr/local/bin \
&& mkdir -p /usr/local/share/cmake-3.12 \
&& cp -r cmake-3.12.4-Linux-x86_64/share/cmake-3.12/* /usr/local/share/cmake-3.12 \
&& rm -rf cmake-3.12.4-Linux-x86_64*
# Download and compile odbc-cpp-wrapper
RUN git clone --branch v0.1 --depth 1 https://github.com/SAP/odbc-cpp-wrapper.git \
&& mkdir odbc-cpp-wrapper/build \
&& cd odbc-cpp-wrapper/build \
Expand Down

0 comments on commit 5becdd9

Please sign in to comment.