beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #28733 from thaJeztah/use-official-fedora25-image

Browse source 
Use official fedora 25 image
This commit is contained in:
Victor Vieux 2016-11-22 17:38:01 -08:00 committed by GitHub
commit 0633c558bb
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/builder/rpm/amd64/fedora-25/Dockerfile
View file

@ -2,7 +2,7 @@
# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
#
FROM andrewh5u/fedora-docker-base-25_beta:1.1
FROM fedora:25
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

5
contrib/builder/rpm/amd64/generate.sh
View file

@ -23,11 +23,6 @@ for version in "${versions[@]}"; do
from="${distro}:${suite}"
installer=yum
# TODO remove when offical image is available
if [[ "$from" == "fedora:25" ]]; then
from="andrewh5u/fedora-docker-base-25_beta:1.1"
fi
if [[ "$distro" == "fedora" ]]; then
installer=dnf
fi