Update Dockerfile

reverting back to the old Docker build approach

1 files changed, 6 insertions, 7 deletions

diff --git a/Dockerfile b/Dockerfile
index 1ac82890..07328891 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.04 AS base
+FROM ubuntu:20.04 AS base
 
 # Install everything except cmake
 RUN apt-get update && \
@@ -25,22 +25,21 @@ RUN apt-get update && \
     libusb-dev \
     pkg-config \
     software-properties-common \
-    cmake \
     sox && \
   rm -rf /var/lib/apt/lists/*
 
 # Need to install newer cmake than what's in Ubuntu repo to build armv7 due to this:
 # https://gitlab.kitware.com/cmake/cmake/-/issues/20568
-#RUN curl https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
-#    apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
-#    apt-get update && \
-#    export DEBIAN_FRONTEND=noninteractive && apt-get install -y cmake && rm -rf /var/lib/apt/lists/*
+RUN curl https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
+    apt-add-repository 'deb https://apt.kitware.com/ubuntu/ focal main' && \
+    apt-get update && \
+    export DEBIAN_FRONTEND=noninteractive && apt-get install -y cmake && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /src
 
 COPY . .
 
-RUN cmake . && make -j`nproc` && cp -i recorder /usr/local/bin
+RUN cmake . && make && cp -i recorder /usr/local/bin
 
 #USER nobody