Dockerfile cleanup, removing "sudo", x64 fixes

Author: Shawn Callegari

modules/CameraCapture/amd64.Dockerfile

@@ -5,7 +5,13 @@ RUN echo "BUILD MODULE: CameraCapture"
 WORKDIR /app
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev python3-pip libboost-python-dev libgtk2.0-dev
+    apt-get install -y --no-install-recommends \
+        python3 \
+        python3-pip \
+        python3-dev \
+        libcurl4-openssl-dev \
+        libboost-python-dev \
+        libgtk2.0-dev
 
 # Install Python packages
 COPY /build/amd64-requirements.txt ./
@@ -14,8 +20,8 @@ RUN pip3 install --upgrade setuptools
 RUN pip3 install -r amd64-requirements.txt
 
 # Cleanup
-RUN sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get -y autoremove
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
 
 ADD /app/ .
 

modules/CameraCapture/arm32v7.Dockerfile

@@ -35,13 +35,13 @@ RUN install_packages \
 
 # Install Python packages
 COPY /build/arm32v7-requirements.txt ./
-RUN sudo pip3 install --upgrade pip
-RUN sudo pip3 install --upgrade setuptools
-RUN sudo pip3 install --index-url=https://www.piwheels.org/simple -r arm32v7-requirements.txt
+RUN pip3 install --upgrade pip
+RUN pip3 install --upgrade setuptools
+RUN pip3 install --index-url=https://www.piwheels.org/simple -r arm32v7-requirements.txt
 
 # Cleanup
-RUN sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get -y autoremove
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
 
 RUN [ "cross-build-end" ]  
 

modules/CameraCapture/test-amd64.Dockerfile

@@ -5,7 +5,13 @@ RUN echo "BUILD MODULE: CameraCapture"
 WORKDIR /app
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev python3-pip libboost-python-dev libgtk2.0-dev
+    apt-get install -y --no-install-recommends \
+        python3 \
+        python3-pip \
+        python3-dev \
+        libcurl4-openssl-dev \
+        libboost-python-dev \
+        libgtk2.0-dev
 
 # Install Python packages
 COPY /build/amd64-requirements.txt ./
@@ -14,8 +20,8 @@ RUN pip3 install --upgrade setuptools
 RUN pip3 install -r amd64-requirements.txt
 
 # Cleanup
-RUN sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get -y autoremove
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
 
 ADD /app/ .
 ADD /test/ .

modules/CameraCapture/test-arm32v7.Dockerfile

@@ -35,13 +35,13 @@ RUN install_packages \
 
 # Install Python packages
 COPY /build/arm32v7-requirements.txt ./
-RUN sudo pip3 install --upgrade pip
-RUN sudo pip3 install --upgrade setuptools
-RUN sudo pip3 install --index-url=https://www.piwheels.org/simple -r arm32v7-requirements.txt
+RUN pip3 install --upgrade pip
+RUN pip3 install --upgrade setuptools
+RUN pip3 install --index-url=https://www.piwheels.org/simple -r arm32v7-requirements.txt
 
 # Cleanup
-RUN sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get -y autoremove
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
 
 RUN [ "cross-build-end" ]
 

modules/ImageClassifierService/arm32v7.Dockerfile

@@ -25,8 +25,8 @@ RUN pip3 install --upgrade setuptools
 RUN pip3 install --index-url=https://www.piwheels.org/simple -r arm32v7-requirements.txt
 
 # Cleanup
-RUN sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get -y autoremove
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
 
 RUN [ "cross-build-end" ]
 

modules/SenseHatDisplay/arm32v7.Dockerfile

@@ -31,8 +31,8 @@ RUN install_packages \
     i2c-tools
 
 # Cleanup
-RUN sudo rm -rf /var/lib/apt/lists/* \
-    && sudo apt-get -y autoremove
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
 
 RUN [ "cross-build-end" ]
 

modules/SenseHatDisplay/test/test-arm32v7.Dockerfile

@@ -30,6 +30,10 @@ RUN install_packages \
     libtiff-tools \
     i2c-tools
 
+# Cleanup
+RUN rm -rf /var/lib/apt/lists/* \
+    && apt-get -y autoremove
+
 RUN [ "cross-build-end" ]
 
 ADD /app/ .