Skip to content

Commit

Permalink
Merge pull request RobotLocomotion#7653 from soonho-tri/pr-fix-docker
Browse files Browse the repository at this point in the history
Replace //drake/... with //... in files under setup/docker
  • Loading branch information
jwnimmer-tri authored Dec 21, 2017
2 parents bc84e73 + 3ceee62 commit cf6ac43
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion setup/docker/Dockerfile.ubuntu16.04.nvidia
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ RUN apt-get update && yes "Y" \
| /drake-distro/setup/ubuntu/16.04/install_prereqs.sh \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean all
RUN cd /drake-distro && bazel build //tools:drake_visualizer && bazel build //drake/examples/acrobot:acrobot_run_passive
RUN cd /drake-distro && bazel build //tools:drake_visualizer && bazel build //examples/acrobot:acrobot_run_passive
ENTRYPOINT ["/drake-distro/setup/docker/entrypoint.sh"]
2 changes: 1 addition & 1 deletion setup/docker/Dockerfile.ubuntu16.04.opensource
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ RUN apt-get update && yes "Y" \
| /drake-distro/setup/ubuntu/16.04/install_prereqs.sh \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean all
RUN cd /drake-distro && bazel build //tools:drake_visualizer && bazel build //drake/examples/acrobot:acrobot_run_passive
RUN cd /drake-distro && bazel build //tools:drake_visualizer && bazel build //examples/acrobot:acrobot_run_passive
ENTRYPOINT ["/drake-distro/setup/docker/entrypoint.sh"]
2 changes: 1 addition & 1 deletion setup/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e -u
bazel build //tools:drake_visualizer
./bazel-bin/tools/drake_visualizer&
sleep 2
bazel run //drake/examples/acrobot:acrobot_run_passive
bazel run //examples/acrobot:acrobot_run_passive
} || {
eval "$@"
}

0 comments on commit cf6ac43

Please sign in to comment.