Browse code
Change generate.sh so that the yum command for packages remains generic across distros.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Avi Miller authored on 2015/07/10 06:34:39Showing 2 changed files
| ... | ... |
@@ -59,13 +59,16 @@ for version in "${versions[@]}"; do
|
| 59 | 59 |
glibc-static |
| 60 | 60 |
libselinux-devel # for "libselinux.so" |
| 61 | 61 |
sqlite-devel # for "sqlite3.h" |
| 62 |
- tar # older versions of dev-tools don't have tar |
|
| 62 |
+ tar # older versions of dev-tools do not have tar |
|
| 63 | 63 |
) |
| 64 |
- if [ "$from" == "oraclelinux:7" ]; then |
|
| 65 |
- echo "RUN yum install --enablerepo=ol7_optional_latest -y ${packages[*]}" >> "$version/Dockerfile"
|
|
| 66 |
- else |
|
| 67 |
- echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
|
|
| 68 |
- fi |
|
| 64 |
+ |
|
| 65 |
+ case "$from" in |
|
| 66 |
+ oraclelinux:7) |
|
| 67 |
+ # Enable the optional repository |
|
| 68 |
+ packages=( --enablerepo=ol7_optional_latest "${packages[*]}" )
|
|
| 69 |
+ ;; |
|
| 70 |
+ esac |
|
| 71 |
+ echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
|
|
| 69 | 72 |
|
| 70 | 73 |
echo >> "$version/Dockerfile" |
| 71 | 74 |
|
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FROM oraclelinux:7 |
| 6 | 6 |
|
| 7 | 7 |
RUN yum groupinstall -y "Development Tools" |
| 8 |
-RUN yum install --enablerepo=ol7_optional_latest -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar |
|
| 8 |
+RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.4.2 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|