Parameterize the Fedora version

.circleci/Dockerfile.fedora

@@ -1,4 +1,5 @@
-FROM fedora:28
+ARG TAG
+FROM fedora:${TAG}
 
 ENV WHEELHOUSE_PATH /tmp/wheelhouse
 ENV VIRTUALENV_PATH /tmp/venv

.circleci/Dockerfile.fedora-29

@@ -1,25 +0,0 @@
-FROM fedora:29
-
-ENV WHEELHOUSE_PATH /tmp/wheelhouse
-ENV VIRTUALENV_PATH /tmp/venv
-# This will get updated by the CircleCI checkout step.
-ENV BUILD_SRC_ROOT /tmp/project
-
-# XXX net-tools is actually a Tahoe-LAFS runtime dependency!
-RUN yum install --assumeyes \
-    git \
-    sudo \
-    make automake gcc gcc-c++ \
-    python \
-    python-devel \
-    libffi-devel \
-    openssl-devel \
-    libyaml-devel \
-    /usr/bin/virtualenv \
-    net-tools
-
-# Get the project source.  Copying in the whole project source here isn't very
-# cache friendly but there's no Docker layer cache on CircleCI anyway!
-COPY . ${BUILD_SRC_ROOT}
-
-RUN "${BUILD_SRC_ROOT}"/.circleci/prepare-image.sh "${WHEELHOUSE_PATH}" "${VIRTUALENV_PATH}" "${BUILD_SRC_ROOT}"

.circleci/config.yml

@@ -400,8 +400,8 @@ jobs:
       - run:
           name: "Build Fedora images"
           command: |
-            docker build -t tahoelafsci/fedora:28 -f ~/project/.circleci/Dockerfile.fedora-28 ~/project/
-            docker build -t tahoelafsci/fedora:29 -f ~/project/.circleci/Dockerfile.fedora-29 ~/project/
+            docker build --build-arg TAG=28 -t tahoelafsci/fedora:28 -f ~/project/.circleci/Dockerfile.fedora ~/project/
+            docker build --build-arg TAG=29 -t tahoelafsci/fedora:29 -f ~/project/.circleci/Dockerfile.fedora ~/project/
       - run:
           name: "Push Fedora images"
           command: |