From 8f5dd4b66e828355a730b8266b192d3ff20941b5 Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:12:19 -0500 Subject: [PATCH 1/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/ariac-server/Dockerfile | 3 +++ ariac-server/run_container.bash | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ariac-server/ariac-server/Dockerfile b/ariac-server/ariac-server/Dockerfile index a72516d..c7c1f3c 100644 --- a/ariac-server/ariac-server/Dockerfile +++ b/ariac-server/ariac-server/Dockerfile @@ -12,6 +12,7 @@ RUN apt-get update \ # setup keys and sources for official Gazebo and ROS debian packages RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys D2486D2DD83DB69272AFE98867170598AF249743 \ + && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F42ED6FBAB17C654 \ && echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable bionic main" > /etc/apt/sources.list.d/gazebo-latest.list \ && apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 421C365BD9FF1F717815A3895523BAEEB01FA116 \ && echo "deb http://packages.ros.org/ros/ubuntu bionic main" > /etc/apt/sources.list.d/ros-latest.list @@ -90,4 +91,6 @@ RUN wget -P /tmp/ https://bitbucket.org/osrf/gazebo_models/get/default.tar.gz \ COPY ./ariac_entrypoint.sh / COPY ./run_ariac_task.sh / + + ENTRYPOINT ["/ariac_entrypoint.sh"] diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index 6e543c3..8fe4a60 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -56,12 +56,12 @@ then fi else DOCKER_GPU_PARAMS="" - DISPLAY_PARAMS="" + DISPLAY_PARAMS=" -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY" fi DISPLAY="${DISPLAY:-:0}" -docker run --rm --name ${CONTAINER} \ +docker run --rm -it --name ${CONTAINER} \ -e XAUTHORITY=/tmp/.docker.xauth \ -e ROS_IP=${IP} \ -e ROS_MASTER_URI=http://${IP}:11311 \ @@ -71,6 +71,7 @@ docker run --rm --name ${CONTAINER} \ -v "/tmp/.docker.xauth:/tmp/.docker.xauth" \ -v /dev/log:/dev/log \ ${DOCKER_EXTRA_ARGS} \ + ${DISPLAY_PARAMS} \ ${DOCKER_GPU_PARAMS} \ ${DOCKER_DISPLAY_PARAMS} \ ${IMAGE_NAME} \ From c14203a20bb9a282f46016117b913d1bd04b58ac Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:16:13 -0500 Subject: [PATCH 2/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/run_container.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index 8fe4a60..f572a22 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -61,7 +61,7 @@ fi DISPLAY="${DISPLAY:-:0}" -docker run --rm -it --name ${CONTAINER} \ +docker run --rm --name ${CONTAINER} \ -e XAUTHORITY=/tmp/.docker.xauth \ -e ROS_IP=${IP} \ -e ROS_MASTER_URI=http://${IP}:11311 \ From 5e358a3f7a18e6096c7c629d59f2f4dba6f498bc Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:20:07 -0500 Subject: [PATCH 3/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/run_container.bash | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index f572a22..b249068 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -56,12 +56,12 @@ then fi else DOCKER_GPU_PARAMS="" - DISPLAY_PARAMS=" -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY" + DISPLAY_PARAMS="" fi DISPLAY="${DISPLAY:-:0}" -docker run --rm --name ${CONTAINER} \ +docker run --rm -it --name ${CONTAINER} \ -e XAUTHORITY=/tmp/.docker.xauth \ -e ROS_IP=${IP} \ -e ROS_MASTER_URI=http://${IP}:11311 \ @@ -73,6 +73,6 @@ docker run --rm --name ${CONTAINER} \ ${DOCKER_EXTRA_ARGS} \ ${DISPLAY_PARAMS} \ ${DOCKER_GPU_PARAMS} \ - ${DOCKER_DISPLAY_PARAMS} \ + ${DISPLAY_PARAMS} \ ${IMAGE_NAME} \ ${COMMAND} From cb3b06fd0f34edab1b2507660510321d9cbf75fe Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:23:32 -0500 Subject: [PATCH 4/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/run_container.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index b249068..bede566 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -61,7 +61,7 @@ fi DISPLAY="${DISPLAY:-:0}" -docker run --rm -it --name ${CONTAINER} \ +docker run --rm --name ${CONTAINER} \ -e XAUTHORITY=/tmp/.docker.xauth \ -e ROS_IP=${IP} \ -e ROS_MASTER_URI=http://${IP}:11311 \ @@ -73,6 +73,6 @@ docker run --rm -it --name ${CONTAINER} \ ${DOCKER_EXTRA_ARGS} \ ${DISPLAY_PARAMS} \ ${DOCKER_GPU_PARAMS} \ - ${DISPLAY_PARAMS} \ + ${DOCKER_DISPLAY_PARAMS} \ ${IMAGE_NAME} \ ${COMMAND} From 331fa54fad9d0564c5a6c59a136ffcfd5ae3e634 Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:24:23 -0500 Subject: [PATCH 5/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/ariac-server/Dockerfile | 2 -- ariac-server/run_container.bash | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ariac-server/ariac-server/Dockerfile b/ariac-server/ariac-server/Dockerfile index c7c1f3c..2f5402d 100644 --- a/ariac-server/ariac-server/Dockerfile +++ b/ariac-server/ariac-server/Dockerfile @@ -91,6 +91,4 @@ RUN wget -P /tmp/ https://bitbucket.org/osrf/gazebo_models/get/default.tar.gz \ COPY ./ariac_entrypoint.sh / COPY ./run_ariac_task.sh / - - ENTRYPOINT ["/ariac_entrypoint.sh"] diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index bede566..8fe4a60 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -56,12 +56,12 @@ then fi else DOCKER_GPU_PARAMS="" - DISPLAY_PARAMS="" + DISPLAY_PARAMS=" -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY" fi DISPLAY="${DISPLAY:-:0}" -docker run --rm --name ${CONTAINER} \ +docker run --rm -it --name ${CONTAINER} \ -e XAUTHORITY=/tmp/.docker.xauth \ -e ROS_IP=${IP} \ -e ROS_MASTER_URI=http://${IP}:11311 \ From 3e68c97e74b3895b1619647ce29064bf763ce75c Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:24:49 -0500 Subject: [PATCH 6/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/run_container.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index 8fe4a60..f572a22 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -61,7 +61,7 @@ fi DISPLAY="${DISPLAY:-:0}" -docker run --rm -it --name ${CONTAINER} \ +docker run --rm --name ${CONTAINER} \ -e XAUTHORITY=/tmp/.docker.xauth \ -e ROS_IP=${IP} \ -e ROS_MASTER_URI=http://${IP}:11311 \ From 5640cf9efa213ea326e39140f93a6df79e03342c Mon Sep 17 00:00:00 2001 From: josiah Date: Sat, 25 Jan 2020 18:25:17 -0500 Subject: [PATCH 7/9] Fixed: - Installation error - Fixed display run variable --- ariac-server/run_container.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ariac-server/run_container.bash b/ariac-server/run_container.bash index f572a22..bede566 100755 --- a/ariac-server/run_container.bash +++ b/ariac-server/run_container.bash @@ -56,7 +56,7 @@ then fi else DOCKER_GPU_PARAMS="" - DISPLAY_PARAMS=" -v /tmp/.X11-unix:/tmp/.X11-unix -e DISPLAY=unix$DISPLAY" + DISPLAY_PARAMS="" fi DISPLAY="${DISPLAY:-:0}" From aeed61aa094e3e4ec6944dfb0977d5fe2bc6dbdd Mon Sep 17 00:00:00 2001 From: josiahls Date: Thu, 30 Jan 2020 21:36:41 -0500 Subject: [PATCH 8/9] changes --- ariac-server/ariac-server/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ariac-server/ariac-server/Dockerfile b/ariac-server/ariac-server/Dockerfile index 2f5402d..2767f34 100644 --- a/ariac-server/ariac-server/Dockerfile +++ b/ariac-server/ariac-server/Dockerfile @@ -53,8 +53,7 @@ RUN mkdir -p /tmp/ros_ws/src RUN /bin/bash -c "source /opt/ros/melodic/setup.bash && \ cd /tmp/ros_ws/src && \ catkin_init_workspace" -RUN git clone \ - https://github.com/osrf/ariac-gazebo_ros_pkgs.git /tmp/ros_ws/src/gazebo_ros_pkgs \ +RUN git clone https://github.com/osrf/ariac-gazebo_ros_pkgs.git /tmp/ros_ws/src/gazebo_ros_pkgs \ -b ariac-network-melodic RUN /bin/bash -c "source /opt/ros/melodic/setup.bash && \ cd /tmp/ros_ws/ && \ From 7fe91053779ffeb50fb7bc5178b88830fe20dd12 Mon Sep 17 00:00:00 2001 From: josiahls Date: Thu, 30 Jan 2020 22:59:39 -0500 Subject: [PATCH 9/9] changes --- ariac-competitor/ariac-competitor/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ariac-competitor/ariac-competitor/Dockerfile b/ariac-competitor/ariac-competitor/Dockerfile index 07d5f3a..a06ac23 100644 --- a/ariac-competitor/ariac-competitor/Dockerfile +++ b/ariac-competitor/ariac-competitor/Dockerfile @@ -1,5 +1,6 @@ FROM ariac/ariac3-competitor-base-melodic:latest +COPY ./fast_rl_ws /fast_rl_ws COPY ./build_team_system.bash / RUN chmod 755 /build_team_system.bash RUN /build_team_system.bash