summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Hsu <andrewhsu@docker.com>2016-12-04 16:24:44 -0800
committerVictor Vieux <victorvieux@gmail.com>2016-12-05 10:13:02 -0800
commit4d92237de1b34c8bf99e549db27b83fd087cd765 (patch)
treec3c5c9609f56b7ff26d58c0c2f9c8ff31dddb693
parentc0522e349ac67438bf3fcfe9f5c8ebf766820988 (diff)
downloaddocker-4d92237de1b34c8bf99e549db27b83fd087cd765.tar.gz
run dnf upgrade before installing in fedorav1.13.0-rc3
Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit ebd804bfb6af27b04514512676619b6a961551dc) Signed-off-by: Victor Vieux <victorvieux@gmail.com>
-rw-r--r--contrib/builder/rpm/amd64/fedora-23/Dockerfile1
-rw-r--r--contrib/builder/rpm/amd64/fedora-24/Dockerfile1
-rw-r--r--contrib/builder/rpm/amd64/fedora-25/Dockerfile1
-rwxr-xr-xcontrib/builder/rpm/amd64/generate.sh3
4 files changed, 6 insertions, 0 deletions
diff --git a/contrib/builder/rpm/amd64/fedora-23/Dockerfile b/contrib/builder/rpm/amd64/fedora-23/Dockerfile
index c2e5bf0789..7d9353d2cf 100644
--- a/contrib/builder/rpm/amd64/fedora-23/Dockerfile
+++ b/contrib/builder/rpm/amd64/fedora-23/Dockerfile
@@ -4,6 +4,7 @@
FROM fedora:23
+RUN dnf -y upgrade
RUN dnf install -y @development-tools fedora-packager
RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
diff --git a/contrib/builder/rpm/amd64/fedora-24/Dockerfile b/contrib/builder/rpm/amd64/fedora-24/Dockerfile
index 0d79914ebe..07e3733252 100644
--- a/contrib/builder/rpm/amd64/fedora-24/Dockerfile
+++ b/contrib/builder/rpm/amd64/fedora-24/Dockerfile
@@ -4,6 +4,7 @@
FROM fedora:24
+RUN dnf -y upgrade
RUN dnf install -y @development-tools fedora-packager
RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
diff --git a/contrib/builder/rpm/amd64/fedora-25/Dockerfile b/contrib/builder/rpm/amd64/fedora-25/Dockerfile
index c80a4deb1e..2663832603 100644
--- a/contrib/builder/rpm/amd64/fedora-25/Dockerfile
+++ b/contrib/builder/rpm/amd64/fedora-25/Dockerfile
@@ -4,6 +4,7 @@
FROM fedora:25
+RUN dnf -y upgrade
RUN dnf install -y @development-tools fedora-packager
RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
diff --git a/contrib/builder/rpm/amd64/generate.sh b/contrib/builder/rpm/amd64/generate.sh
index 895837e3c8..58a5381fc2 100755
--- a/contrib/builder/rpm/amd64/generate.sh
+++ b/contrib/builder/rpm/amd64/generate.sh
@@ -53,6 +53,9 @@ for version in "${versions[@]}"; do
echo "RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek" >> "$version/Dockerfile"
echo >> "$version/Dockerfile"
;;
+ fedora:*)
+ echo "RUN ${installer} -y upgrade" >> "$version/Dockerfile"
+ ;;
*) ;;
esac