From f119f30ef7da3a657c736ac29a9b8245ad5ad793 Mon Sep 17 00:00:00 2001 From: Ruffin Date: Mon, 18 May 2020 17:04:27 -0700 Subject: [PATCH] Don't pass rosdistro when using empty index (#1752) Context: https://github.com/osrf/docker_images/pull/399 --- .circleci/config.yml | 3 +-- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 81b5933c67..489949f118 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,8 +70,7 @@ references: (echo vcs_export && cat) >> checksum.txt sha256sum $PWD/checksum.txt >> checksum.txt apt-get update - rosdep update \ - --rosdistro=$ROS_DISTRO + rosdep update dependencies=$( rosdep install -q -y \ --from-paths src \ diff --git a/Dockerfile b/Dockerfile index 764d9fb313..abcb8ffaea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ FROM $FROM_IMAGE AS builder RUN apt-get update && apt-get install -q -y \ ccache \ lcov \ - && rosdep update --rosdistro=$ROS_DISTRO \ + && rosdep update \ && rm -rf /var/lib/apt/lists/* # install underlay dependencies