From d265f93f6e9f6232b957592bba9a25fbc426a8c9 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Wed, 23 Sep 2015 04:48:06 -0700 Subject: [PATCH] fix zypper BS wrt interactive Signed-off-by: Jessica Frazelle --- contrib/builder/rpm/generate.sh | 4 ++-- contrib/builder/rpm/opensuse-13.2/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/builder/rpm/generate.sh b/contrib/builder/rpm/generate.sh index ac4ee79b94..44fd3a98a8 100755 --- a/contrib/builder/rpm/generate.sh +++ b/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" diff --git a/contrib/builder/rpm/opensuse-13.2/Dockerfile b/contrib/builder/rpm/opensuse-13.2/Dockerfile index 3894631778..701c929158 100644 --- a/contrib/builder/rpm/opensuse-13.2/Dockerfile +++ b/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