浏览代码

Upgrade CMake to newer version.

master
Ray Burgemeestre 5 年前
父节点
当前提交
55665201df
共有 2 个文件被更改,包括 17 次插入1 次删除
  1. +14
    -1
      Dockerfile-ubuntu1804
  2. +3
    -0
      Makefile

+ 14
- 1
Dockerfile-ubuntu1804 查看文件

MAINTAINER Ray Burgemeestre MAINTAINER Ray Burgemeestre


RUN apt-get update && \ RUN apt-get update && \
apt-get -y install g++ git cmake sudo wget gnupg2 && \
apt-get -y install g++ git sudo wget gnupg2 && \
apt-get -y install libssl-dev build-essential && \
\ \
echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main >> /etc/apt/sources.list && \ echo deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main >> /etc/apt/sources.list && \
echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main >> /etc/apt/sources.list && \ echo deb-src http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main >> /etc/apt/sources.list && \
\ \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*


# Install newer CMake to avoid some warnings the "FindBoost" script throws on
# more recent versions of boost that the system CMake doesn't now about.
RUN wget https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2.tar.gz && \
tar -zxf cmake-3.16.2.tar.gz && \
pushd cmake-3.16.2 && \
./bootstrap && \
make -j $(nproc) && \
make install && \
popd && \
rm -rf cmake-3.16.2 && \
rm -rf cmake-3.16.2.tar.gz

CMD "/bin/bash" CMD "/bin/bash"

+ 3
- 0
Makefile 查看文件



ubuntu1804publish: ubuntu1804publish:
docker push rayburgemeestre/build-ubuntu:18.04 docker push rayburgemeestre/build-ubuntu:18.04

shell:
docker run -it -v $$PWD:$$PWD --workdir $$PWD rayburgemeestre/build-ubuntu:18.04 /bin/bash

正在加载...
取消
保存