Skip to content

Commit

Permalink
Remove pid:host hack as bug is now closed - ros2/rmw_fastrtps#349
Browse files Browse the repository at this point in the history
  • Loading branch information
smartin015 committed Jun 18, 2020
1 parent 8b0d36d commit 0604558
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 12 deletions.
3 changes: 0 additions & 3 deletions infra/ros/bridge/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,17 @@ services:
- "PYTHONUNBUFFERED=1"
bridge_local:
image: l2bridge:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
network_mode: host
command: bash -c "source /opt/ros/foxy/setup.bash && source /l2_msgs/install/setup.bash && cd /ros2-web-bridge && rm -r /ros2-web-bridge/node_modules/rclnodejs/generated && node bin/rosbridge.js --address=ws://127.0.0.1:4243"
bridge_local_dev:
image: l2bridge:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
network_mode: host
# DEBUG=ros2-web-bridge:index,ros2-web-bridge:Bridge,ros2-web-bridge:ResourceProvider
command: bash -c "source /opt/ros/foxy/setup.bash && source /l2_msgs/install/setup.bash && cd /ros2-web-bridge && rm -r /ros2-web-bridge/node_modules/rclnodejs/generated && node bin/rosbridge.js --address=ws://127.0.0.1:4243"
volumes:
- ./ros2-web-bridge:/ros2-web-bridge
bridge_server:
image: l2bridge:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
networks:
- l2
command: bash -c "source /opt/ros/foxy/setup.bash && source /l2_msgs/install/setup.bash && cd /ros2-web-bridge && node bin/rosbridge.js --port=4243"
Expand Down
1 change: 0 additions & 1 deletion infra/ros/cad/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ version: '3.4'
services:
main:
image: l2example:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
1 change: 0 additions & 1 deletion infra/ros/example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ version: '3.5'
services:
main:
image: l2example:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
networks:
- l2

Expand Down
1 change: 0 additions & 1 deletion infra/ros/sim/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ version: '3.5'
services:
sim:
image: l2sim
pid: host # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
ipc: host
networks:
- l2
Expand Down
2 changes: 0 additions & 2 deletions infra/ros/storage/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ version: '3.5'
services:
storage:
image: l2storage:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
environment:
PYTHONUNBUFFERED: 1
PGRST_DB_URI: postgres://app_user:password@db:5432/app_db
Expand All @@ -16,7 +15,6 @@ services:
- l2
db:
image: postgres
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
ports:
- "5432:5432"
environment:
Expand Down
1 change: 0 additions & 1 deletion infra/ros/supervisor/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ version: '3.5'
services:
main:
image: l2supervisor:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
networks:
- l2
environment:
Expand Down
1 change: 0 additions & 1 deletion infra/ros/tasks/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ version: '3.4'
services:
main:
image: l2tasks:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
environment:
PYTHONUNBUFFERED: 1
2 changes: 0 additions & 2 deletions infra/ros/vr/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ version: '3.5'
services:
vr_syncer:
image: l2vr:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
networks:
- l2
environment:
- PYTHONUNBUFFERED=1
command: ros2 run l2_vr node --ros-args -p extra_names:=[]
vr_fwd:
image: l2vr:latest
pid: "host" # TODO(https://github.com/ros2/rmw_fastrtps/issues/349)
networks:
- l2
environment:
Expand Down

0 comments on commit 0604558

Please sign in to comment.