Skip to content
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.

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

DP-1279 feature/proxy-archives #58

Merged
merged 1 commit into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docker/noetic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,19 @@

# Install requirements for ppa certificates registration
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \

Check failure on line 44 in docker/noetic/Dockerfile

View workflow job for this annotation

GitHub Actions / movai-base-noetic / build_deploy

DL3008 warning: Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`

Check failure on line 44 in docker/noetic/Dockerfile

View workflow job for this annotation

GitHub Actions / movai-base-noetic / build_deploy

DL3027 warning: Do not use apt as it is meant to be a end-user tool, use apt-get or apt-cache instead

Check failure on line 44 in docker/noetic/Dockerfile

View workflow job for this annotation

GitHub Actions / movai-base-noetic / build_deploy

DL3008 warning: Pin versions in apt get install. Instead of `apt-get install <package>` use `apt-get install <package>=<version>`

Check failure on line 44 in docker/noetic/Dockerfile

View workflow job for this annotation

GitHub Actions / movai-base-noetic / build_deploy

DL3027 warning: Do not use apt as it is meant to be a end-user tool, use apt-get or apt-cache instead
apt update &&\
apt-get install -y curl gnupg --no-install-recommends

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 - &&\
Expand Down
4 changes: 4 additions & 0 deletions files/apt/movai-ros-proxy.list
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion files/apt/movai-ubuntu-archive-proxy.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
2 changes: 2 additions & 0 deletions files/apt/movai-ubuntu-ports-proxy.list
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading