Refactoring Dockerfiles

Author: retspen

Dockerfile.debian12

@@ -17,7 +17,7 @@ FROM debian:12
 COPY src /src
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt update && \
+RUN apt update; \
     apt install -y gir1.2-nm-1.0 \
                    python3-pip \
                    python3-dev \
@@ -27,7 +27,6 @@ RUN apt update && \
                    python3-guestfs \
                    python3-openssl \
                    python3-paramiko \
-                   python3-firewall 
-
-RUN python3 -m pip install --break-system-packages -U pip wheel setuptools && \
-    python3 -m pip install --break-system-packages -r /src/requirements/build.txt
+                   python3-firewall; \
+    python3 -m pip install --break-system-packages -U pip wheel setuptools; \
+    python3 -m pip install --break-system-packages -r /src/requirements/build.txt

Dockerfile.rhel8

@@ -16,7 +16,7 @@ FROM rockylinux:8
 
 COPY src /src
 
-RUN dnf install -y epel-release && \
+RUN dnf install -y epel-release; \
     dnf install -y python3-pip \
                    python3-lxml \
                    python3-devel \
@@ -26,7 +26,6 @@ RUN dnf install -y epel-release && \
                    python3-firewall \
                    python3-pyOpenSSL \
                    python3-libnmstate \
-                   python3-libguestfs
-
-RUN python3 -m pip install -U pip wheel setuptools && \
-    python3 -m pip install -r /src/requirements/build.txt
+                   python3-libguestfs; \
+    python3 -m pip install -U pip wheel setuptools; \
+    python3 -m pip install -r /src/requirements/build.txt

Dockerfile.rhel9

@@ -16,7 +16,7 @@ FROM rockylinux:9
 
 COPY src /src
 
-RUN dnf install -y epel-release && \
+RUN dnf install -y epel-release; \
     dnf install -y python3-pip \
                    python3-lxml \
                    python3-devel \
@@ -26,7 +26,6 @@ RUN dnf install -y epel-release && \
                    python3-firewall \
                    python3-pyOpenSSL \
                    python3-libnmstate \
-                   python3-libguestfs
-
-RUN python3 -m pip install -U pip wheel setuptools && \
-    python3 -m pip install -r /src/requirements/build.txt
+                   python3-libguestfs; \
+    python3 -m pip install -U pip wheel setuptools; \
+    python3 -m pip install -r /src/requirements/build.txt

Dockerfile.ubuntu2204

@@ -17,7 +17,7 @@ FROM ubuntu:22.04
 COPY src /src
 
 ARG DEBIAN_FRONTEND=noninteractive
-RUN apt update && \
+RUN apt update; \
     apt install -y gir1.2-nm-1.0 \
                    python3-pip \
                    python3-dev \
@@ -27,7 +27,6 @@ RUN apt update && \
                    python3-guestfs \
                    python3-openssl \
                    python3-paramiko \
-                   python3-firewall 
-
-RUN python3 -m pip install -U pip wheel setuptools && \
-    python3 -m pip install -r /src/requirements/build.txt
+                   python3-firewall; \
+    python3 -m pip install -U pip wheel setuptools; \
+    python3 -m pip install -r /src/requirements/build.txt