diff --git a/.travis.yml b/.travis.yml index 5ebfb69..f6a4e96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,6 @@ env: - LSB_RELEASE=xenial DOCKER_CACHE_FILE=/home/travis/docker/xenial-cache.tar.gz CC=gcc CXX=g++ - LSB_RELEASE=bionic DOCKER_CACHE_FILE=/home/travis/docker/bionic-cache.tar.gz CC=gcc CXX=g++ - LSB_RELEASE=focal DOCKER_CACHE_FILE=/home/travis/docker/focal-cache.tar.gz CC=gcc CXX=g++ - - LSB_RELEASE=jessie DOCKER_CACHE_FILE=/home/travis/docker/jessie-cache.tar.gz CC=gcc CXX=g++ - LSB_RELEASE=stretch DOCKER_CACHE_FILE=/home/travis/docker/stretch-cache.tar.gz CC=gcc CXX=g++ before_install: scripts/load_docker_cache.sh diff --git a/Dockerfile.jessie b/Dockerfile.jessie deleted file mode 100644 index 0908e62..0000000 --- a/Dockerfile.jessie +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2016 The Cartographer Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM debian:jessie - -ARG cc -ARG cxx - -# Set the preferred C/C++ compiler toolchain, if given (otherwise default). -ENV CC=$cc -ENV CXX=$cxx - -# This base image doesn't ship with sudo. -RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/* - -COPY scripts/install_debs_cmake.sh cartographer/scripts/ -RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/* -COPY scripts/install_abseil.sh cartographer/scripts/ -RUN cartographer/scripts/install_abseil.sh && rm -rf /var/lib/apt/lists/* -COPY scripts/install_ceres.sh cartographer/scripts/ -RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver -COPY scripts/install_proto3.sh cartographer/scripts/ -RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf -COPY . cartographer -RUN cartographer/scripts/install_cartographer_cmake.sh && rm -rf cartographer diff --git a/scripts/install_debs_cmake.sh b/scripts/install_debs_cmake.sh index bc8649e..aed400f 100755 --- a/scripts/install_debs_cmake.sh +++ b/scripts/install_debs_cmake.sh @@ -19,21 +19,9 @@ set -o verbose # Install the required libraries that are available as debs. sudo apt-get update - -# Install CMake 3.2 for Debian Jessie. -sudo apt-get install lsb-release -y -if [[ "$(lsb_release -sc)" = "jessie" ]] -then - sudo sh -c "echo 'deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main' >> /etc/apt/sources.list" - sudo sh -c "echo 'Acquire::Check-Valid-Until \"false\";' >> /etc/apt/apt.conf" - sudo apt-get update - sudo apt-get -t jessie-backports install cmake -y -else - sudo apt-get install cmake -y -fi - sudo apt-get install -y \ clang \ + cmake \ g++ \ git \ google-mock \ @@ -45,6 +33,7 @@ sudo apt-get install -y \ libgoogle-glog-dev \ liblua5.2-dev \ libsuitesparse-dev \ + lsb-release \ ninja-build \ stow