share/containers/: Specify one argument per line

Reviewed-by: "Serge E. Hallyn" <serge@hallyn.com>
Cc: Iker Pedrosa <ipedrosa@redhat.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/share/containers/alpine.dockerfile b/share/containers/alpine.dockerfile
index 07d496c3fe7f684d7e8bb06974c40c6e53a85fe1..8c48e865f9b96573b1234cc6bcc2fcbefd1cc62a 100644 (file)
--- a/share/containers/alpine.dockerfile
+++ b/share/containers/alpine.dockerfile
@@ -2,13 +2,29 @@ ARG OS_IMAGE="alpine:latest"
 
 FROM "${OS_IMAGE}" AS build
 
-RUN apk add autoconf automake build-base byacc cmocka-dev expect gettext-dev \
-        git libbsd-dev libeconf-dev libtool libxslt pkgconf
+RUN apk add \
+       autoconf \
+       automake \
+       build-base \
+       byacc \
+       cmocka-dev \
+       expect \
+       gettext-dev \
+        git \
+       libbsd-dev \
+       libeconf-dev \
+       libtool \
+       libxslt \
+       pkgconf
 
 COPY ./ /usr/local/src/shadow/
 WORKDIR /usr/local/src/shadow/
 
-RUN ./autogen.sh --without-selinux --disable-man --disable-nls --with-yescrypt
+RUN ./autogen.sh \
+       --without-selinux \
+       --disable-man \
+       --disable-nls \
+       --with-yescrypt
 RUN make -kj4 || true
 RUN make
 RUN make check

diff --git a/share/containers/debian.dockerfile b/share/containers/debian.dockerfile
index 09492939d05a4215abd7c3c4fedc4e1bbc1e5de1..3dd05ac0dc39a7dd0c2a38f091dc68debcebd473 100644 (file)
--- a/share/containers/debian.dockerfile
+++ b/share/containers/debian.dockerfile
@@ -9,12 +9,20 @@ RUN export DEBIAN_PRIORITY=critical \
 RUN apt-get update -y \
     && apt-get dist-upgrade -y
 RUN apt-get build-dep shadow -y
-RUN apt-get install libltdl-dev libbsd-dev libcmocka-dev pkgconf -y
+RUN apt-get install \
+       libltdl-dev \
+       libbsd-dev \
+       libcmocka-dev \
+       pkgconf \
+       -y
 
 COPY ./ /usr/local/src/shadow/
 WORKDIR /usr/local/src/shadow/
 
-RUN ./autogen.sh --without-selinux --enable-man --with-yescrypt
+RUN ./autogen.sh \
+       --without-selinux \
+       --enable-man \
+       --with-yescrypt
 RUN make -kj4 || true
 RUN make
 RUN make check

diff --git a/share/containers/fedora.dockerfile b/share/containers/fedora.dockerfile
index 85e8b4808c5cd52ffe4aa88e86942ba1256ddccd..c701d9e7ba4436858c925ee3a8290857b87982c8 100644 (file)
--- a/share/containers/fedora.dockerfile
+++ b/share/containers/fedora.dockerfile
@@ -2,16 +2,29 @@ ARG OS_IMAGE="fedora:latest"
 
 FROM "${OS_IMAGE}" AS build
 
-RUN dnf install -y dnf-plugins-core libcmocka-devel systemd-devel
+RUN dnf install -y \
+       dnf-plugins-core \
+       libcmocka-devel \
+       systemd-devel
 RUN dnf builddep -y shadow-utils
 
 COPY ./ /usr/local/src/shadow/
 WORKDIR /usr/local/src/shadow/
 
-RUN ./autogen.sh --enable-shadowgrp --enable-man --with-audit \
-        --with-sha-crypt --with-bcrypt --with-yescrypt --with-selinux \
-        --without-libpam --enable-shared --without-libbsd \
-        --with-group-name-max-length=32 --enable-lastlog --enable-logind=no
+RUN ./autogen.sh \
+       --enable-shadowgrp \
+       --enable-man \
+       --with-audit \
+        --with-sha-crypt \
+       --with-bcrypt \
+       --with-yescrypt \
+       --with-selinux \
+        --without-libpam \
+       --enable-shared \
+       --without-libbsd \
+        --with-group-name-max-length=32 \
+       --enable-lastlog \
+       --enable-logind=no
 RUN make -kj4 || true
 RUN make
 RUN make check