Browse code
Use official fedora 25 image
Fedora 25 was released today, and the official
image will be available soon.
This removes the temporary override, so that
we can build using the official image.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn authored on 2016/11/23 09:12:39Showing 2 changed files
| ... | ... |
@@ -2,7 +2,7 @@ |
| 2 | 2 |
# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"! |
| 3 | 3 |
# |
| 4 | 4 |
|
| 5 |
-FROM andrewh5u/fedora-docker-base-25_beta:1.1 |
|
| 5 |
+FROM fedora:25 |
|
| 6 | 6 |
|
| 7 | 7 |
RUN dnf install -y @development-tools fedora-packager |
| 8 | 8 |
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 |
| ... | ... |
@@ -23,11 +23,6 @@ for version in "${versions[@]}"; do
|
| 23 | 23 |
from="${distro}:${suite}"
|
| 24 | 24 |
installer=yum |
| 25 | 25 |
|
| 26 |
- # TODO remove when offical image is available |
|
| 27 |
- if [[ "$from" == "fedora:25" ]]; then |
|
| 28 |
- from="andrewh5u/fedora-docker-base-25_beta:1.1" |
|
| 29 |
- fi |
|
| 30 |
- |
|
| 31 | 26 |
if [[ "$distro" == "fedora" ]]; then |
| 32 | 27 |
installer=dnf |
| 33 | 28 |
fi |