From: Alejandro Colomar <alx@kernel.org>
Date: Wed, 28 Feb 2024 11:07:22 +0000 (+0100)
Subject: share/containers/: Specify one argument per line
X-Git-Tag: 4.15.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e59a39663d6175d98a529f5668871c3e19e6818b;p=thirdparty%2Fshadow.git

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 07d496c3f..8c48e865f 100644
--- 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 09492939d..3dd05ac0d 100644
--- 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 85e8b4808..c701d9e7b 100644
--- 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