From 1dbddbda7c4a14d7a87a957b3df5faa9191cef08 Mon Sep 17 00:00:00 2001
From: jyjblrd <jyjbird@gmail.com>
Date: Mon, 8 Apr 2024 19:07:26 +0100
Subject: [PATCH] show full docker output and remove requirements txt

---
 .github/workflows/config.yml | 68 +++++++++++++++++++-----------------
 nvidia_jetson.Dockerfile     |  4 ---
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 0beabc1..2f2b748 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -35,42 +35,44 @@ jobs:
   #         target-ros2-distro: iron
   #         skip-tests: true
   
-  build-docker:
-    runs-on: ubuntu-latest
-    env:      
-      DOCKER_IMAGE: joshuabird/part_ii_project
-      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}  
-      DOCKER_TARGET_PLATFORM: linux/arm64
-    steps:    
-    - name: Checkout the code       
-      uses: actions/checkout@v1     
+  # build-docker:
+  #   runs-on: ubuntu-latest
+  #   env:      
+  #     DOCKER_IMAGE: joshuabird/part_ii_project
+  #     DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  #     DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}  
+  #     DOCKER_TARGET_PLATFORM: linux/arm64
+  #     PROGRESS_NO_TRUNC: 1 
+  #   steps:    
+  #   - name: Checkout the code       
+  #     uses: actions/checkout@v1     
 
-    - name: Set up Docker Buildx      
-      uses: crazy-max/ghaction-docker-buildx@v1      
-      with:        
-        version: latest    
+  #   - name: Set up Docker Buildx      
+  #     uses: crazy-max/ghaction-docker-buildx@v1      
+  #     with:        
+  #       version: latest    
 
-    - name: Prepare      
-      if: success()      
-      id: prepare      
-      run: |        
-        echo ::set-output name=docker_platform::${DOCKER_TARGET_PLATFORM}        
-        echo ::set-output name=docker_image::${DOCKER_IMAGE}    
+  #   - name: Prepare      
+  #     if: success()      
+  #     id: prepare      
+  #     run: |        
+  #       echo ::set-output name=docker_platform::${DOCKER_TARGET_PLATFORM}        
+  #       echo ::set-output name=docker_image::${DOCKER_IMAGE}    
 
-    - name: Docker Login      
-      if: success()      
-      run: |        
-        echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin          
+  #   - name: Docker Login      
+  #     if: success()      
+  #     run: |        
+  #       echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin          
 
-    - name: Run Buildx (push image)      
-      if: success()      
-      run: |        
-        docker buildx build \
-          --platform ${{ steps.prepare.outputs.docker_platform }} \
-          --tag ${{ steps.prepare.outputs.docker_image }}:latest \
-          --file ./Dockerfile \
-          --output type=image,push=true .
+  #   - name: Run Buildx (push image)      
+  #     if: success()      
+  #     run: |        
+  #       docker buildx build \
+  #         --platform ${{ steps.prepare.outputs.docker_platform }} \
+  #         --tag ${{ steps.prepare.outputs.docker_image }}:latest \
+  #         --file ./Dockerfile \
+  #         --progress plain \
+  #         --output type=image,push=true .
 
   build-nvidia-jetson-docker:
     runs-on: ubuntu-latest
@@ -79,6 +81,7 @@ jobs:
       DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
       DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}  
       DOCKER_TARGET_PLATFORM: linux/arm64
+      PROGRESS_NO_TRUNC: 1 
     steps:    
     - name: Checkout the code       
       uses: actions/checkout@v1     
@@ -107,4 +110,5 @@ jobs:
           --platform ${{ steps.prepare.outputs.docker_platform }} \
           --tag ${{ steps.prepare.outputs.docker_image }}:latest \
           --file ./nvidia_jetson.Dockerfile \
+          --progress plain \
           --output type=image,push=true .
\ No newline at end of file
diff --git a/nvidia_jetson.Dockerfile b/nvidia_jetson.Dockerfile
index 261b6c3..4474714 100644
--- a/nvidia_jetson.Dockerfile
+++ b/nvidia_jetson.Dockerfile
@@ -4,10 +4,6 @@ FROM dustynv/ros:humble-ros-base-l4t-r35.3.1
 # Add system packages to be installed here
 RUN apt-get update && apt-get install -y git vim
 
-# Optional python packages (better to copy requirements
-COPY requirements.txt /tmp
-RUN pip3 install -r /tmp/requirements.txt
-
 #RUN mkdir -p /opt/robomaster/src
 #COPY src /opt/root_ws/src