Add Debian Buster to the install script and CI. (#1715)
Signed-off-by: Wolfgang Hess <whess@lyft.com>master
parent
595ffba0ce
commit
de76ed9fdc
|
@ -26,6 +26,7 @@ env:
|
||||||
- LSB_RELEASE=bionic DOCKER_CACHE_FILE=/home/travis/docker/bionic-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=focal DOCKER_CACHE_FILE=/home/travis/docker/focal-cache.tar.gz CC=gcc CXX=g++
|
||||||
- LSB_RELEASE=stretch DOCKER_CACHE_FILE=/home/travis/docker/stretch-cache.tar.gz CC=gcc CXX=g++
|
- LSB_RELEASE=stretch DOCKER_CACHE_FILE=/home/travis/docker/stretch-cache.tar.gz CC=gcc CXX=g++
|
||||||
|
- LSB_RELEASE=buster DOCKER_CACHE_FILE=/home/travis/docker/buster-cache.tar.gz CC=gcc CXX=g++
|
||||||
|
|
||||||
before_install: scripts/load_docker_cache.sh
|
before_install: scripts/load_docker_cache.sh
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
|
||||||
FROM ubuntu:bionic
|
FROM ubuntu:bionic
|
||||||
|
|
||||||
ARG cc
|
ARG cc
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
# Copyright 2020 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:buster
|
||||||
|
|
||||||
|
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 . cartographer
|
||||||
|
RUN cartographer/scripts/install_cartographer_cmake.sh && rm -rf cartographer
|
|
@ -12,7 +12,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
|
||||||
FROM ubuntu:focal
|
FROM ubuntu:focal
|
||||||
|
|
||||||
ARG cc
|
ARG cc
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
|
|
||||||
FROM ubuntu:xenial
|
FROM ubuntu:xenial
|
||||||
|
|
||||||
ARG cc
|
ARG cc
|
||||||
|
|
|
@ -37,21 +37,17 @@ sudo apt-get install -y \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
stow
|
stow
|
||||||
|
|
||||||
if [[ "$(lsb_release -sc)" = "focal" ]]
|
# Install Ceres Solver and Protocol Buffers support if available.
|
||||||
|
# No need to build it ourselves.
|
||||||
|
if [[ "$(lsb_release -sc)" = "focal" || "$(lsb_release -sc)" = "buster" ]]
|
||||||
then
|
then
|
||||||
sudo apt-get install -y python3-sphinx libgmock-dev
|
sudo apt-get install -y python3-sphinx libgmock-dev libceres-dev protobuf-compiler
|
||||||
else
|
else
|
||||||
sudo apt-get install -y python-sphinx
|
sudo apt-get install -y python-sphinx
|
||||||
fi
|
if [[ "$(lsb_release -sc)" = "bionic" ]]
|
||||||
|
then
|
||||||
# Install Ceres Solver on Ubuntu Bionic. No need to build it ourselves.
|
|
||||||
if [[ "$(lsb_release -sc)" = "bionic" ]]
|
|
||||||
then
|
|
||||||
sudo apt-get install -y libceres-dev
|
sudo apt-get install -y libceres-dev
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install Ceres Solver and Protocol Buffers support on Ubuntu Focal. No need to build it ourselves.
|
|
||||||
if [[ "$(lsb_release -sc)" = "focal" ]]
|
|
||||||
then
|
|
||||||
sudo apt-get install -y libceres-dev protobuf-compiler
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Reference in New Issue