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.

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

Removed wget logging #335

Merged
merged 3 commits into from
Oct 17, 2024
Merged

Removed wget logging #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a45a030
Removed wget logging
JulianTrommer Oct 17, 2024
76af12d
Fixed args & wget
JulianTrommer Oct 17, 2024
a6110a5
Added build action to push on main
JulianTrommer Oct 17, 2024
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
8 changes: 7 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
workflows: ["Check code format"]
types:
- completed
push:
branches:
- main

env:
REGISTRY: ghcr.io
Expand Down Expand Up @@ -51,4 +54,7 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
cache-from: type=gha
cache-to: type=gha,mode=max
build-args: USERNAME=paf,USER_UID=1000,USER_GID=1000
build-args: |
USERNAME=paf
USER_UID=1000
USER_GID=1000
Comment on lines +57 to +60
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Wget Logging Removal Not Addressed

The current changes improve the formatting of the build-args section, enhancing readability and maintainability. However, the removal of wget logging as outlined in the PR objective has not been addressed.

  • Wget Usage: Multiple instances of wget are still present in the codebase, and their associated logging has not been removed or modified.

Please ensure that wget logging is explicitly removed or handled as per the PR objectives.

🔗 Analysis chain

Approve formatting change and suggest addressing PR objective

The reformatting of the build-args section improves readability and maintainability of the workflow file. This change aligns with YAML best practices and makes it easier to manage build arguments in the future.

However, this change doesn't directly address the PR objective of removing wget logging as mentioned in the linked issue #333.

To ensure we're not missing any wget-related changes, let's run a quick check:

Could you please clarify how this PR addresses the wget logging issue? If it's handled elsewhere, consider updating the PR description to explain the approach taken.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for any wget-related changes in the repository

# Search for wget in all files
echo "Searching for wget usage:"
rg 'wget'

# Search for any logging-related changes
echo "Searching for logging-related changes:"
rg 'log|logging'

Length of output: 28150

6 changes: 3 additions & 3 deletions build/docker/agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ RUN apt-get install wget unzip

# Download Carla PythonAPI (alternative to getting it from the Carla-Image, which is commented out above)
# If the PythonAPI/Carla version changes, either update the link, or refer to the comment at the top of this file.
RUN wget https://github.com/una-auxme/paf/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip -O PythonAPI.zip \
RUN wget https://github.com/una-auxme/paf/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip --quiet -O PythonAPI.zip \
&& unzip PythonAPI.zip \
&& rm PythonAPI.zip \
&& mkdir -p /opt/carla \
Expand All @@ -43,9 +43,9 @@ RUN rm -f /var/lib/dpkg/info/fprintd.postinst \
&& dpkg --configure -a

# CUDA installation
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin \
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin --quiet \
&& mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 \
&& wget https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda-repo-ubuntu2004-11-8-local_11.8.0-520.61.05-1_amd64.deb \
&& wget https://developer.download.nvidia.com/compute/cuda/11.8.0/local_installers/cuda-repo-ubuntu2004-11-8-local_11.8.0-520.61.05-1_amd64.deb --quiet \
&& dpkg -i cuda-repo-ubuntu2004-11-8-local_11.8.0-520.61.05-1_amd64.deb \
&& cp /var/cuda-repo-ubuntu2004-11-8-local/cuda-*-keyring.gpg /usr/share/keyrings/ \
&& apt-get update \
Expand Down
8 changes: 4 additions & 4 deletions build/docker/agent/Dockerfile_Submission
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ RUN apt-get update \
# install dependencies for libgit2 and Carla PythonAPI
RUN apt-get install wget unzip

RUN wget https://github.com/una-auxme/paf/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip -O PythonAPI.zip \
RUN wget https://github.com/una-auxme/paf/releases/download/v0.0.1/PythonAPI_Leaderboard-2.0.zip --quiet -O PythonAPI.zip \
&& unzip PythonAPI.zip \
&& rm PythonAPI.zip \
&& mkdir -p /opt/carla \
&& mv PythonAPI /opt/carla/PythonAPI

# build libgit2
RUN wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.0.tar.gz -O libgit2-1.5.0.tar.gz \
RUN wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.0.tar.gz --quiet -O libgit2-1.5.0.tar.gz \
&& tar xzf libgit2-1.5.0.tar.gz \
&& cd libgit2-1.5.0/ \
&& cmake . \
Expand All @@ -44,9 +44,9 @@ RUN wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.0.tar.gz -O l
&& rm -r libgit2-1.5.0/

# CUDA installation
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin \
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin --quiet \
&& mv cuda-ubuntu2004.pin /etc/apt/preferences.d/cuda-repository-pin-600 \
&& wget https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda-repo-ubuntu2004-11-7-local_11.7.0-515.43.04-1_amd64.deb \
&& wget https://developer.download.nvidia.com/compute/cuda/11.7.0/local_installers/cuda-repo-ubuntu2004-11-7-local_11.7.0-515.43.04-1_amd64.deb --quiet \
&& dpkg -i cuda-repo-ubuntu2004-11-7-local_11.7.0-515.43.04-1_amd64.deb \
&& cp /var/cuda-repo-ubuntu2004-11-7-local/cuda-*-keyring.gpg /usr/share/keyrings/ \
&& apt-get update \
Expand Down
Loading