From 2221e13c71b5cc693dd3bebfa4061d4ab6821437 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 18 May 2020 14:31:50 -0700
Subject: [PATCH] upload artifact already compresses

---
 .github/workflows/test.yaml | 20 ++++++++++----------
 Dockerfile.openpilot        |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ce249b2532..631f57b40a 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -4,7 +4,7 @@ on: [push, pull_request]
 env:
   RUN: docker run --shm-size 1G --rm tmppilot /bin/sh -c
   PERSIST: docker run --shm-size 1G --name tmppilot tmppilot /bin/sh -c
-  LOAD: docker load -i tmppilot.tar.gz/tmppilot.tar.gz
+  LOAD: docker load < tmppilot/tmppilot
   CI_RUN: docker run -e GITHUB_ACTION -e GITHUB_REF -e GITHUB_HEAD_REF -e GITHUB_SHA -e GITHUB_REPOSITORY -e GITHUB_RUN_ID --rm tmppilotci /bin/bash -c
   UNIT_TEST: coverage run --append -m unittest discover
 
@@ -22,11 +22,11 @@ jobs:
         docker pull docker.io/commaai/openpilot:latest || true
 
         docker build --cache-from docker.io/commaai/openpilot:latest -t tmppilot -f Dockerfile.openpilot .
-        docker save tmppilot:latest | gzip > tmppilot.tar.gz
+        docker save tmppilot:latest > tmppilot
     - uses: actions/upload-artifact@v2
       with:
-        name: tmppilot.tar.gz
-        path: tmppilot.tar.gz
+        name: tmppilot
+        path: tmppilot
 
   build_release:
     name: build release
@@ -72,7 +72,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v1
         with:
-          name: tmppilot.tar.gz
+          name: tmppilot
       - name: Load image
         run: $LOAD
       - name: Login to dockerhub
@@ -89,7 +89,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v1
         with:
-          name: tmppilot.tar.gz
+          name: tmppilot
       - name: Load image
         run: $LOAD
       - name: flake8
@@ -104,7 +104,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v1
         with:
-          name: tmppilot.tar.gz
+          name: tmppilot
       - name: Load image
         run: $LOAD
       - name: Run unit tests
@@ -134,7 +134,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v1
         with:
-          name: tmppilot.tar.gz
+          name: tmppilot
       - name: Load image
         run: $LOAD
       - name: Run replay
@@ -167,7 +167,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v1
         with:
-          name: tmppilot.tar.gz
+          name: tmppilot
       - name: Load image
         run: $LOAD
       - name: Test longitudinal
@@ -196,7 +196,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v1
         with:
-          name: tmppilot.tar.gz
+          name: tmppilot
       - name: Load image
         run: $LOAD
       - name: Test car models
diff --git a/Dockerfile.openpilot b/Dockerfile.openpilot
index 5ee93a422f..b2cc34aef2 100644
--- a/Dockerfile.openpilot
+++ b/Dockerfile.openpilot
@@ -10,6 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     clang \
     cmake \
     curl \
+    ffmpeg \
     git \
     libarchive-dev \
     libbz2-dev \