Skip to content

Fix: Missing Public Key and Incorrect Run Variable #34

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

Open
josiahls wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix: Missing Public Key and Incorrect Run Variable #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8f5dd4b
Fixed:
Jan 25, 2020
c14203a
Fixed:
Jan 25, 2020
5e358a3
Fixed:
Jan 25, 2020
cb3b06f
Fixed:
Jan 25, 2020
331fa54
Fixed:
Jan 25, 2020
3e68c97
Fixed:
Jan 25, 2020
5640cf9
Fixed:
Jan 25, 2020
aeed61a
changes
Jan 31, 2020
7fe9105
changes
Jan 31, 2020
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
1 change: 1 addition & 0 deletions ariac-competitor/ariac-competitor/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ariac-server/ariac-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -52,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/ && \
Expand Down
1 change: 1 addition & 0 deletions ariac-server/run_container.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down