kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Change generate.sh so that the yum command for packages remains generic across distros.

Browse source 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
This commit is contained in:
Avi Miller 2015-07-10 07:34:39 +10:00
parent 0117330ae7
commit f18c4f23cc
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
contrib/builder/rpm/generate.sh
View file

@ -59,13 +59,16 @@ for version in "${versions[@]}"; do
glibc-static glibc-static
libselinux-devel # for "libselinux.so" libselinux-devel # for "libselinux.so"
sqlite-devel # for "sqlite3.h" sqlite-devel # for "sqlite3.h"
tar # older versions of dev-tools don't have tar tar # older versions of dev-tools do not have tar
) )
if [ "$from" == "oraclelinux:7" ]; then
echo "RUN yum install --enablerepo=ol7_optional_latest -y ${packages[*]}" >> "$version/Dockerfile" case "$from" in
else oraclelinux:7)
echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile" # Enable the optional repository
fi packages=( --enablerepo=ol7_optional_latest "${packages[*]}" )
;;
esac
echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
echo >> "$version/Dockerfile" echo >> "$version/Dockerfile"

2
contrib/builder/rpm/oraclelinux-7/Dockerfile
View file

@ -5,7 +5,7 @@
FROM oraclelinux:7 FROM oraclelinux:7
RUN yum groupinstall -y "Development Tools" RUN yum groupinstall -y "Development Tools"
RUN yum install --enablerepo=ol7_optional_latest -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar RUN yum install -y --enablerepo=ol7_optional_latest 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
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local