p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14414 from jfrazelle/fix-rpms

Browse Source 
fix rpms
Upstream-commit: 2905fe4806cd00ed267138b4e2b94a80a2b7ad0d
Component: engine
This commit is contained in:
David Calavera
2015-07-06 17:12:38 -07:00
parent d3498560e9 863d4d7ae6
commit 0958d62678
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/engine/contrib/builder/rpm/centos-7/Dockerfile
View File

@ -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

4
components/engine/contrib/builder/rpm/generate.sh
View File

@ -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"