Browse code
Fix rpm generation on oraclelinux-6
The uek kernel needs to be install first in order to get the correct
btrfs tools version.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Kenfe-Mickael Laventure authored on 2016/05/06 03:57:29Showing 2 changed files
| ... | ... |
@@ -42,6 +42,17 @@ for version in "${versions[@]}"; do
|
| 42 | 42 |
runcBuildTags= |
| 43 | 43 |
|
| 44 | 44 |
case "$from" in |
| 45 |
+ oraclelinux:6) |
|
| 46 |
+ # We need a known version of the kernel-uek-devel headers to set CGO_CPPFLAGS, so grab the UEKR4 GA version |
|
| 47 |
+ # This requires using yum-config-manager from yum-utils to enable the UEKR4 yum repo |
|
| 48 |
+ echo "RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4" >> "$version/Dockerfile" |
|
| 49 |
+ echo "RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek" >> "$version/Dockerfile" |
|
| 50 |
+ echo >> "$version/Dockerfile" |
|
| 51 |
+ ;; |
|
| 52 |
+ *) ;; |
|
| 53 |
+ esac |
|
| 54 |
+ |
|
| 55 |
+ case "$from" in |
|
| 45 | 56 |
centos:*) |
| 46 | 57 |
# get "Development Tools" packages dependencies |
| 47 | 58 |
echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile" |
| ... | ... |
@@ -125,17 +136,6 @@ for version in "${versions[@]}"; do
|
| 125 | 125 |
|
| 126 | 126 |
echo >> "$version/Dockerfile" |
| 127 | 127 |
|
| 128 |
- case "$from" in |
|
| 129 |
- oraclelinux:6) |
|
| 130 |
- # We need a known version of the kernel-uek-devel headers to set CGO_CPPFLAGS, so grab the UEKR4 GA version |
|
| 131 |
- # This requires using yum-config-manager from yum-utils to enable the UEKR4 yum repo |
|
| 132 |
- echo "RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4" >> "$version/Dockerfile" |
|
| 133 |
- echo "RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek" >> "$version/Dockerfile" |
|
| 134 |
- echo >> "$version/Dockerfile" |
|
| 135 |
- ;; |
|
| 136 |
- *) ;; |
|
| 137 |
- esac |
|
| 138 |
- |
|
| 139 | 128 |
|
| 140 | 129 |
awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile >> "$version/Dockerfile"
|
| 141 | 130 |
echo 'RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
|
| ... | ... |
@@ -4,12 +4,12 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM oraclelinux:6 |
| 6 | 6 |
|
| 7 |
-RUN yum groupinstall -y "Development Tools" |
|
| 8 |
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel tar git |
|
| 9 |
- |
|
| 10 | 7 |
RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4 |
| 11 | 8 |
RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek |
| 12 | 9 |
|
| 10 |
+RUN yum groupinstall -y "Development Tools" |
|
| 11 |
+RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel tar git |
|
| 12 |
+ |
|
| 13 | 13 |
ENV GO_VERSION 1.5.4 |
| 14 | 14 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| 15 | 15 |
ENV PATH $PATH:/usr/local/go/bin |