Browse code
update dockerfile to use dnf because i hate the warning
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Jessica Frazelle authored on 2015/10/28 02:25:39Showing 2 changed files
| ... | ... |
@@ -4,8 +4,8 @@ |
| 4 | 4 |
|
| 5 | 5 |
FROM fedora:22 |
| 6 | 6 |
|
| 7 |
-RUN yum install -y @development-tools fedora-packager |
|
| 8 |
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 7 |
+RUN dnf install -y @development-tools fedora-packager |
|
| 8 |
+RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libselinux-devel selinux-policy selinux-policy-devel sqlite-devel tar |
|
| 9 | 9 |
|
| 10 | 10 |
ENV GO_VERSION 1.4.3 |
| 11 | 11 |
RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
| ... | ... |
@@ -21,6 +21,10 @@ for version in "${versions[@]}"; do
|
| 21 | 21 |
distro="${version%-*}"
|
| 22 | 22 |
suite="${version##*-}"
|
| 23 | 23 |
from="${distro}:${suite}"
|
| 24 |
+ installer=yum |
|
| 25 |
+ if [[ "$distro" == "fedora" ]] && [[ "$suite" -ge "22" ]]; then |
|
| 26 |
+ installer=dnf |
|
| 27 |
+ fi |
|
| 24 | 28 |
|
| 25 | 29 |
mkdir -p "$version" |
| 26 | 30 |
echo "$version -> FROM $from" |
| ... | ... |
@@ -52,7 +56,7 @@ for version in "${versions[@]}"; do
|
| 52 | 52 |
echo 'RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build' >> "$version/Dockerfile" |
| 53 | 53 |
;; |
| 54 | 54 |
*) |
| 55 |
- echo 'RUN yum install -y @development-tools fedora-packager' >> "$version/Dockerfile" |
|
| 55 |
+ echo "RUN ${installer} install -y @development-tools fedora-packager" >> "$version/Dockerfile"
|
|
| 56 | 56 |
;; |
| 57 | 57 |
esac |
| 58 | 58 |
|
| ... | ... |
@@ -82,7 +86,7 @@ for version in "${versions[@]}"; do
|
| 82 | 82 |
echo "RUN zypper --non-interactive install ${packages[*]}" >> "$version/Dockerfile"
|
| 83 | 83 |
;; |
| 84 | 84 |
*) |
| 85 |
- echo "RUN yum install -y ${packages[*]}" >> "$version/Dockerfile"
|
|
| 85 |
+ echo "RUN ${installer} install -y ${packages[*]}" >> "$version/Dockerfile"
|
|
| 86 | 86 |
;; |
| 87 | 87 |
esac |
| 88 | 88 |
|