Pass GitHub access token to Dockerfile. (#787)

master
Michael Grupp 2018-04-05 10:30:35 +02:00 committed by Christoph Schütte
parent f5c88ff32e
commit 12816aacd3
5 changed files with 38 additions and 5 deletions

View File

@ -26,9 +26,11 @@ env:
- ROS_RELEASE=kinetic DOCKER_CACHE_FILE=/home/travis/docker/kinetic-cache.tar.gz - ROS_RELEASE=kinetic DOCKER_CACHE_FILE=/home/travis/docker/kinetic-cache.tar.gz
- ROS_RELEASE=lunar DOCKER_CACHE_FILE=/home/travis/docker/lunar-cache.tar.gz - ROS_RELEASE=lunar DOCKER_CACHE_FILE=/home/travis/docker/lunar-cache.tar.gz
before_install: scripts/load_docker_cache.sh before_install:
- scripts/check_access_token.sh $GITHUB_TOKEN
- scripts/load_docker_cache.sh
install: true install: true
script: script:
- docker build ${TRAVIS_BUILD_DIR} -t cartographer_ros:${ROS_RELEASE} -f Dockerfile.${ROS_RELEASE} - docker build ${TRAVIS_BUILD_DIR} -t cartographer_ros:${ROS_RELEASE} -f Dockerfile.${ROS_RELEASE} --build-arg github_token=${GITHUB_TOKEN}
- scripts/save_docker_cache.sh - scripts/save_docker_cache.sh

View File

@ -16,10 +16,13 @@ FROM ros:indigo
ARG CARTOGRAPHER_VERSION=master ARG CARTOGRAPHER_VERSION=master
# We require a GitHub access token to be passed.
ARG github_token
# First, we invalidate the entire cache if googlecartographer/cartographer has # First, we invalidate the entire cache if googlecartographer/cartographer has
# changed. This file's content changes whenever master changes. See: # changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone # http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master \ ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master?access_token=$github_token \
cartographer_ros/cartographer_version.json cartographer_ros/cartographer_version.json
# wstool needs the updated rosinstall file to clone the correct repos. # wstool needs the updated rosinstall file to clone the correct repos.

View File

@ -16,13 +16,16 @@ FROM ros:kinetic
ARG CARTOGRAPHER_VERSION=master 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. # Xenial's base image doesn't ship with sudo.
RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
# First, we invalidate the entire cache if googlecartographer/cartographer has # First, we invalidate the entire cache if googlecartographer/cartographer has
# changed. This file's content changes whenever master changes. See: # changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone # http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master \ ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master?access_token=$github_token \
cartographer_ros/cartographer_version.json cartographer_ros/cartographer_version.json
# wstool needs the updated rosinstall file to clone the correct repos. # wstool needs the updated rosinstall file to clone the correct repos.

View File

@ -16,13 +16,16 @@ FROM ros:lunar
ARG CARTOGRAPHER_VERSION=master 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. # Xenial's base image doesn't ship with sudo.
RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
# First, we invalidate the entire cache if googlecartographer/cartographer has # First, we invalidate the entire cache if googlecartographer/cartographer has
# changed. This file's content changes whenever master changes. See: # changed. This file's content changes whenever master changes. See:
# http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone # http://stackoverflow.com/questions/36996046/how-to-prevent-dockerfile-caching-git-clone
ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master \ ADD https://api.github.com/repos/googlecartographer/cartographer/git/refs/heads/master?access_token=$github_token \
cartographer_ros/cartographer_version.json cartographer_ros/cartographer_version.json
# wstool needs the updated rosinstall file to clone the correct repos. # wstool needs the updated rosinstall file to clone the correct repos.

22
scripts/check_access_token.sh Executable file
View File

@ -0,0 +1,22 @@
#!/bin/bash
# Usage: ./check_access_token.sh ACCESS_TOKEN
# Returns non-zero exit code if ACCESS_TOKEN is invalid.
if [ "$#" -ne 1 ]; then
echo "Please provide an access token to $0" 1>&2
exit 1
fi
token=$1
set -e
function on_error {
echo "Failed to validate GitHub access token!" 1>&2
exit 1
}
trap on_error ERR
test_response=$(curl -s https://api.github.com/?access_token=${token})
echo $test_response | grep -ivq "bad credentials"
echo $"GitHub access token is valid."