Attempt to fix more linter issues

LedFx · Mar 6, 2021 · f2a7c1f · f2a7c1f
1 parent 6ee7d41
commit f2a7c1f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,19 +8,14 @@ ENV PATH="/ledfx/venv/bin:$PATH"
 
 # Install dependencies and ledfx, remove uneeded packages
 #
-RUN apt-get update 
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc \
         # alsa-utils \
         libatlas3-base \
         portaudio19-dev \
         # pulseaudio \
-        python3-dev 
+        python3-dev && apt-get purge -y gcc python3-dev && apt-get clean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 RUN pip install ledfx-dev
-RUN apt-get purge -y gcc python3-dev 
-RUN apt-get clean -y 
-RUN apt-get autoremove -y 
-RUN rm -rf /var/lib/apt/lists/*
 
 # Add user `ledfx` and create home folder
 RUN useradd --create-home ledfx

diff --git a/Dockerfile-4stage b/Dockerfile-4stage
@@ -11,10 +11,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         alsa-utils \
         libatlas3-base \
         portaudio19-dev \
-        pulseaudio 
+        pulseaudio && rm -rf /var/lib/apt/lists/*
 RUN apt-get clean -y 
 RUN apt-get autoremove -y
-RUN rm -rf /var/lib/apt/lists/*
+
 
 ### Create docker image from venv-image as compile-image to speed up builds
 #
@@ -25,8 +25,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libc-dev \
         nodejs \
         npm \
-        python3-dev
-RUN rm -rf /var/lib/apt/lists/*
+        python3-dev && rm -rf /var/lib/apt/lists/*
 
 ### Create docker image from compile-image to pull and build from github
 #

diff --git a/Dockerfile-armv7 b/Dockerfile-armv7
@@ -16,9 +16,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libatlas3-base \
         # llvm-9 \
         portaudio19-dev \
-        pulseaudio \
-    && apt-get clean -y \
-    && apt-get autoremove -y
+        pulseaudio && rm -rf /var/lib/apt/lists/*
+RUN apt-get clean -y \
+RUN apt-get autoremove -y
 #   && ln -s /usr/bin/llvm-config-9 /usr/bin/llvm-config
 
 ############### COMPILE IMAGE ###############
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libc-dev \
         # nodejs \
         # npm \
-        python3-dev
+        python3-dev && rm -rf /var/lib/apt/lists/*
 
 ########## BUILD IMAGE ##########
 FROM compile-image AS build-image

diff --git a/Dockerfile.compile b/Dockerfile.compile
@@ -5,6 +5,5 @@ ENV PATH="/ledfx/venv/bin:$PATH"
 WORKDIR /ledfx
 RUN apt-get update && apt-get install -y --no-install-recommends \
         gcc \
-        libc-dev
+        libc-dev && apt-get clean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 RUN pip install ledfx-dev
-RUN rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile.venv b/Dockerfile.venv
@@ -11,7 +11,4 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
       #   libasound2 \
       #   libasound2-plugins \
         portaudio19-dev \
-        pulseaudio 
-RUN apt-get clean -y 
-RUN apt-get autoremove -y
-RUN rm -rf /var/lib/apt/lists/*
+        pulseaudio && apt-get clean -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*