docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14414 from jfrazelle/fix-rpms 

fix rpms
This commit is contained in:
David Calavera 2015-07-06 17:12:38 -07:00
parent 6ffce0131c 76a853de6e
commit 2905fe4806
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
FROM centos:7 FROM centos:7
RUN yum groupinstall -y "Development Tools" 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 RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar
ENV GO_VERSION 1.4.2 ENV GO_VERSION 1.4.2

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

@ -38,6 +38,10 @@ for version in "${versions[@]}"; do
centos:*) centos:*)
# get "Development Tools" packages dependencies # get "Development Tools" packages dependencies
echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile" 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" echo 'RUN yum install -y @development-tools fedora-packager' >> "$version/Dockerfile"