Skip to content

Commit

Permalink
use larics
Browse files Browse the repository at this point in the history
  • Loading branch information
ojura committed Aug 31, 2020
1 parent 97883c4 commit 3eb91b2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 9 deletions.
5 changes: 1 addition & 4 deletions Dockerfile.kinetic
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ FROM ros:kinetic

ARG CARTOGRAPHER_VERSION=master

# We require a GitHub access token to be passed.
ARG github_token

# Xenial's base image doesn't ship with sudo.
RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*

# First, we invalidate the entire cache if cartographer-project/cartographer has
# changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/heads/master?access_token=$github_token \
ADD https://api.github.com/repos/larics/cartographer/git/refs/heads/master \
cartographer_ros/cartographer_version.json

# wstool needs the updated rosinstall file to clone the correct repos.
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile.noetic
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ FROM ros:noetic

ARG CARTOGRAPHER_VERSION=master

# We require a GitHub access token to be passed.
ARG github_token

# Prevent any interaction required by apt-get.
# https://stackoverflow.com/questions/22466255
ARG DEBIAN_FRONTEND=noninteractive
Expand All @@ -29,7 +26,7 @@ RUN apt-get update && apt-get install -y sudo git && rm -rf /var/lib/apt/lists/*
# First, we invalidate the entire cache if cartographer-project/cartographer has
# changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/heads/master?access_token=$github_token \
ADD https://api.github.com/repos/larics/cartographer/git/refs/heads/master \
cartographer_ros/cartographer_version.json

# wstool needs the updated rosinstall file to clone the correct repos.
Expand Down
2 changes: 1 addition & 1 deletion cartographer_ros.rosinstall
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- git: {local-name: cartographer, uri: 'https://github.com/cartographer-project/cartographer.git', version: '1.0.0'}
- git: {local-name: cartographer, uri: 'https://github.com/larics/cartographer.git'}
- git: {local-name: cartographer_ros, uri: 'https://github.com/cartographer-project/cartographer_ros.git', version: '1.0.0'}
- git: {local-name: ceres-solver, uri: 'https://ceres-solver.googlesource.com/ceres-solver.git', version: '1.13.0'}

0 comments on commit 3eb91b2

Please sign in to comment.