Unify the Fedora version

diff --git a/.travis.fedora.sh b/.travis.fedora.sh
index 5f0d603c089669f132dec6b5d16378ade58ef681..ae33c6e2831d3baee7ae7af0e584f446bb5c43a2 100755 (executable)
--- a/.travis.fedora.sh
+++ b/.travis.fedora.sh
@@ -11,7 +11,7 @@ make package
 # /proc and /sys in the chroot).
 mkdir -p /root/rpmbuild/SOURCES
 cp package/* /root/rpmbuild/SOURCES
-rpmbuild -bb --with coverage -D "fedora_version 25" -D "jobs `nproc`" package/*.spec
+rpmbuild -bb --with coverage -D "fedora_version $DOCKER_TAG" -D "jobs `nproc`" package/*.spec
 
 # test the %pre/%post scripts by installing/updating/removing the built packages
 # ignore the dependencies to make the test easier, as a smoke test it's good enough

diff --git a/.travis.yml b/.travis.yml
index 3d89123384a599d4283ad721370a61714133fa6a..5573b8d80736bcc1f114af7b1372f2d0e8b358e0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ services:
 env:
   - BUILD_FLAVOR=tumbleweed
   - BUILD_FLAVOR=leap
-  - BUILD_FLAVOR=fedora
+  - BUILD_FLAVOR=fedora DOCKER_TAG=31
   - BUILD_FLAVOR=ubuntu DOCKER_TAG=18.10
   - BUILD_FLAVOR=debian DOCKER_TAG=9
 
@@ -18,4 +18,4 @@ before_install:
 script:
   # run the respective .travis.<distro>.sh script
   # (--privileged: integration tests mount a loopback device etc.)
-  - docker run --privileged -it -e COVERALLS_TOKEN="$COVERALLS_TOKEN" snapper-devel ./.travis.$BUILD_FLAVOR.sh
+  - docker run --privileged -it -e COVERALLS_TOKEN="$COVERALLS_TOKEN" -e DOCKER_TAG=$DOCKER_TAG snapper-devel ./.travis.$BUILD_FLAVOR.sh

diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 9e021570c8a541400da3ed385f2141b6cdf87a95..43bf136b2ebad09f4eaac1ae36b01627e5f76d7b 100644 (file)
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -1,5 +1,8 @@
-# Build Fedora 31 image
-FROM fedora:31
+# https://docs.docker.com/engine/reference/builder/#from
+ARG BUILD_FLAVOR
+ARG DOCKER_TAG
+
+FROM ${BUILD_FLAVOR}:${DOCKER_TAG}
 
 RUN dnf -y install \
   acl \