Merge pull request #16522 from jfrazelle/zypper-wtaf

fix zypper wrt interactive

contrib/builder/rpm/generate.sh

@@ -49,7 +49,7 @@ for version in "${versions[@]}"; do
 			;;
 		opensuse:*)
 			# get rpm-build and curl packages and dependencies
-			echo 'RUN zypper install -n ca-certificates* curl gzip rpm-build' >> "$version/Dockerfile"
+			echo 'RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build' >> "$version/Dockerfile"
 			;;
 		*)
 			echo 'RUN yum install -y @development-tools fedora-packager' >> "$version/Dockerfile"
@@ -79,7 +79,7 @@ for version in "${versions[@]}"; do
 		opensuse:*)
 			packages=( "${packages[@]/btrfs-progs-devel/libbtrfs-devel}" )
 			# use zypper
-			echo "RUN zypper install -n ${packages[*]}" >> "$version/Dockerfile"
+			echo "RUN zypper --non-interactive install ${packages[*]}" >> "$version/Dockerfile"
 			;;
 		*)
 			echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"

contrib/builder/rpm/opensuse-13.2/Dockerfile

@@ -4,8 +4,8 @@
 
 FROM opensuse:13.2
 
-RUN zypper install -n ca-certificates* curl gzip rpm-build
-RUN zypper install -n libbtrfs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar
+RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build
+RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar
 
 ENV GO_VERSION 1.4.2
 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local