From 76a853de6eee072e4874a64e4c5ffcceacdccbf1 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Mon, 6 Jul 2015 14:14:26 -0700 Subject: [PATCH] fix rpms Signed-off-by: Jessica Frazelle --- contrib/builder/rpm/centos-7/Dockerfile | 1 + contrib/builder/rpm/generate.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/contrib/builder/rpm/centos-7/Dockerfile b/contrib/builder/rpm/centos-7/Dockerfile index d7e4f2c0ac..60fe464857 100644 --- a/contrib/builder/rpm/centos-7/Dockerfile +++ b/contrib/builder/rpm/centos-7/Dockerfile @@ -5,6 +5,7 @@ FROM centos:7 RUN yum groupinstall -y "Development Tools" +RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar ENV GO_VERSION 1.4.2 diff --git a/contrib/builder/rpm/generate.sh b/contrib/builder/rpm/generate.sh index b34193c664..5a5748bf91 100755 --- a/contrib/builder/rpm/generate.sh +++ b/contrib/builder/rpm/generate.sh @@ -38,6 +38,10 @@ for version in "${versions[@]}"; do centos:*) # get "Development Tools" packages dependencies echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile" + + if [[ "$version" == "centos-7" ]]; then + echo 'RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs' >> "$version/Dockerfile" + fi ;; *) echo 'RUN yum install -y @development-tools fedora-packager' >> "$version/Dockerfile"