From a45a030d673cbb28b06d23fdd19dd328c44a690e Mon Sep 17 00:00:00 2001 From: JulianTrommer Date: Thu, 17 Oct 2024 08:33:21 +0200 Subject: [PATCH 1/3] Removed wget logging --- build/docker/agent/Dockerfile | 6 +++--- build/docker/agent/Dockerfile_Submission | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/docker/agent/Dockerfile b/build/docker/agent/Dockerfile index dff54814..37ad9260 100644 --- a/build/docker/agent/Dockerfile +++ b/build/docker/agent/Dockerfile @@ -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 -q -o /dev/null -O PythonAPI.zip \ && unzip PythonAPI.zip \ && rm PythonAPI.zip \ && mkdir -p /opt/carla \ @@ -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 -q -o /dev/null \ && 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 -q -o /dev/null \ && 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 \ diff --git a/build/docker/agent/Dockerfile_Submission b/build/docker/agent/Dockerfile_Submission index 8128266e..bb67a3f1 100644 --- a/build/docker/agent/Dockerfile_Submission +++ b/build/docker/agent/Dockerfile_Submission @@ -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 -q -o /dev/null -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 -q -o /dev/null -O libgit2-1.5.0.tar.gz \ && tar xzf libgit2-1.5.0.tar.gz \ && cd libgit2-1.5.0/ \ && cmake . \ @@ -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 -q -o /dev/null \ && 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 -q -o /dev/null \ && 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 \ From 76af12d53c01c44bf80fc6c58a1b237b271dcc60 Mon Sep 17 00:00:00 2001 From: JulianTrommer Date: Thu, 17 Oct 2024 09:15:22 +0200 Subject: [PATCH 2/3] Fixed args & wget --- .github/workflows/build.yml | 5 ++++- build/docker/agent/Dockerfile | 6 +++--- build/docker/agent/Dockerfile_Submission | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a495da2..23c1d623 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,4 +51,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 diff --git a/build/docker/agent/Dockerfile b/build/docker/agent/Dockerfile index 37ad9260..408fae6c 100644 --- a/build/docker/agent/Dockerfile +++ b/build/docker/agent/Dockerfile @@ -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 -q -o /dev/null -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 \ @@ -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 -q -o /dev/null \ +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 -q -o /dev/null \ + && 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 \ diff --git a/build/docker/agent/Dockerfile_Submission b/build/docker/agent/Dockerfile_Submission index bb67a3f1..b9f49fee 100644 --- a/build/docker/agent/Dockerfile_Submission +++ b/build/docker/agent/Dockerfile_Submission @@ -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 -q -o /dev/null -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 -q -o /dev/null -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 . \ @@ -44,9 +44,9 @@ RUN wget https://github.com/libgit2/libgit2/archive/refs/tags/v1.5.0.tar.gz -q - && rm -r libgit2-1.5.0/ # CUDA installation -RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/cuda-ubuntu2004.pin -q -o /dev/null \ +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 -q -o /dev/null \ + && 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 \ From a6110a5f40260bfad21e4d27b301a1382814c8ae Mon Sep 17 00:00:00 2001 From: JulianTrommer Date: Thu, 17 Oct 2024 09:24:46 +0200 Subject: [PATCH 3/3] Added build action to push on main --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23c1d623..9ea2693c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,9 @@ on: workflows: ["Check code format"] types: - completed + push: + branches: + - main env: REGISTRY: ghcr.io