From 0b0399a1f9ce0c9fcc1e2b93673ae9db9d847b10 Mon Sep 17 00:00:00 2001 From: Vladyslav Usenko Date: Tue, 28 Apr 2020 23:01:10 +0200 Subject: [PATCH] Updates to Docker, Readme and CI --- .gitlab-ci.yml | 12 +++++++----- README.md | 10 +++++++--- docker/{b_image => b_image_bionic}/Dockerfile | 0 3 files changed, 14 insertions(+), 8 deletions(-) rename docker/{b_image => b_image_bionic}/Dockerfile (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc45e7b..5340804 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: vladyslavusenko/b_image:latest +image: vladyslavusenko/b_image_bionic:latest variables: GIT_SUBMODULE_STRATEGY: recursive @@ -141,6 +141,7 @@ stages: bionic-release-compile: <<: *prepare_docker_definition <<: *compile_test_package_definition + image: vladyslavusenko/b_image_bionic:latest variables: CXX_MARCH: 'sandybridge' DEB_DIR: deb_bionic @@ -224,6 +225,7 @@ clang-format: bionic-test: <<: *test_deb_definition + image: vladyslavusenko/b_image_bionic:latest only: - master variables: @@ -362,7 +364,7 @@ docker-build-bionic: variables: DOCKER_TLS_CERTDIR: '/certs' GIT_SUBMODULE_STRATEGY: none - B_IMAGE_NAME: b_image + B_IMAGE_NAME: b_image_bionic docker-build-xenial: <<: *docker_build_definition @@ -395,21 +397,21 @@ docker-build-focal: - basalt_rs_t265_vio --help - basalt_rs_t265_record --help -repository-check-bionic: +bionic-repository-check: image: ubuntu:18.04 <<: *repository_check_definition variables: GIT_STRATEGY: none REPO_NAME: bionic -repository-check-xenial: +xenial-repository-check: image: ubuntu:16.04 <<: *repository_check_definition variables: GIT_STRATEGY: none REPO_NAME: xenial -repository-check-focal: +focal-repository-check: image: ubuntu:20.04 <<: *repository_check_definition variables: diff --git a/README.md b/README.md index 9583ed7..bd8348d 100644 --- a/README.md +++ b/README.md @@ -29,12 +29,16 @@ Calibration (describes B-spline trajectory representation used in camera-IMU cal ## Installation -### APT installation for Ubuntu 16.04 and 18.04 (Fast) +### APT installation for Ubuntu 20.04, 18.04 and 16.04 (Fast) Set up keys ``` sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0D97B6C9 ``` -Add the repository to the sources list. On **Ubuntu 18.04** run: +Add the repository to the sources list. On **Ubuntu 20.04** run: +``` +sudo sh -c 'echo "deb [arch=amd64] http://packages.usenko.eu/ubuntu focal main" > /etc/apt/sources.list.d/basalt.list' +``` +On **Ubuntu 18.04** run: ``` sudo sh -c 'echo "deb [arch=amd64] http://packages.usenko.eu/ubuntu bionic main" > /etc/apt/sources.list.d/basalt.list' ``` @@ -47,7 +51,7 @@ Update the Ubuntu package index and install Basalt: sudo apt-get update sudo apt-get install basalt ``` -### Source installation for Ubuntu 18.04 and MacOS >= 10.11 El Capitan +### Source installation for Ubuntu >= 18.04 and MacOS >= 10.14 Mojave Clone the source code for the project and build it. For MacOS you should have [Homebrew](https://brew.sh/) installed. ``` git clone --recursive https://gitlab.com/VladyslavUsenko/basalt.git diff --git a/docker/b_image/Dockerfile b/docker/b_image_bionic/Dockerfile similarity index 100% rename from docker/b_image/Dockerfile rename to docker/b_image_bionic/Dockerfile