Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quickfix: do not use official Docker images by default #516

Merged
merged 1 commit into from
May 28, 2020
Merged

quickfix: do not use official Docker images by default #516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion industrial_ci/src/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ export ROS_DISTRO
export ROS_VERSION
export ROS_VERSION_EOL
export ROS_PYTHON_VERSION
export DEFAULT_DOCKER_IMAGE

# exit with error if OS_NAME is set, but OS_CODE_NAME is not.
# assume ubuntu as default
Expand Down Expand Up @@ -219,7 +220,7 @@ if [ -z "$OS_CODE_NAME" ]; then
ici_error "ROS distro '$ROS_DISTRO' is not supported"
fi
OS_CODE_NAME=$DEFAULT_OS_CODE_NAME
DEFAULT_DOCKER_IMAGE=${DEFAULT_DOCKER_IMAGE-ros:${ROS_DISTRO}-ros-core}
#DEFAULT_DOCKER_IMAGE=${DEFAULT_DOCKER_IMAGE-ros:${ROS_DISTRO}-ros-core}
;;
esac
else
Expand Down