diff --git a/docker/noetic/Dockerfile b/docker/noetic/Dockerfile index b856820..c2c2c1d 100644 --- a/docker/noetic/Dockerfile +++ b/docker/noetic/Dockerfile @@ -48,12 +48,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio COPY files/apt/movai-ubuntu-archive-proxy.list /etc/apt/sources.list.d/movai-ubuntu-archive-proxy.list COPY files/apt/movai-ubuntu-ports-proxy.list /etc/apt/sources.list.d/movai-ubuntu-ports-proxy.list COPY files/apt/movai-ubuntu-security-proxy.list /etc/apt/sources.list.d/movai-ubuntu-security-proxy.list +COPY files/apt/movai-ros-proxy.list /etc/apt/sources.list.d/movai-ros-proxy.list SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN find /etc/apt/sources.list.d/ -type f -name 'ros*.list' -exec rm {} \; &&\ echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections &&\ curl -fsSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key | gpg --dearmor -o /usr/share/keyrings/ros.key &&\ - echo "deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main" | tee /etc/apt/sources.list.d/movai-ros.list > /dev/null &&\ mv /etc/apt/sources.list /etc/apt/sources.list.bck &&\ touch /etc/apt/sources.list &&\ curl -fsSL $APT_REPOSITORY/movai-applications/gpg | apt-key add - &&\ diff --git a/files/apt/movai-ros-proxy.list b/files/apt/movai-ros-proxy.list new file mode 100644 index 0000000..cbdab41 --- /dev/null +++ b/files/apt/movai-ros-proxy.list @@ -0,0 +1,4 @@ +# Add ROS proxy +deb [signed-by=/usr/share/keyrings/ros.key] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros focal main +#Add ROS proxy backup +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-proxy-ros-backup ros-backup main diff --git a/files/apt/movai-ubuntu-archive-proxy.list b/files/apt/movai-ubuntu-archive-proxy.list index 5de7207..f127466 100644 --- a/files/apt/movai-ubuntu-archive-proxy.list +++ b/files/apt/movai-ubuntu-archive-proxy.list @@ -11,4 +11,6 @@ deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal # Add focal-backports proxy deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports universe deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports multiverse -deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports main \ No newline at end of file +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backports focal-backports main +# Add backup of focal-archive +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-archive-focal-backup focal-backup main diff --git a/files/apt/movai-ubuntu-ports-proxy.list b/files/apt/movai-ubuntu-ports-proxy.list index f006fd3..578130b 100644 --- a/files/apt/movai-ubuntu-ports-proxy.list +++ b/files/apt/movai-ubuntu-ports-proxy.list @@ -16,3 +16,5 @@ deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-f deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security multiverse deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security universe deb [arch=arm64,armhf] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-security focal-security restricted +# Add backup of focal-ports +deb [arch=amd64] https://artifacts.aws.cloud.mov.ai/repository/ppa-ports-focal-backup portsfocal-backup main \ No newline at end of file