From 74bb78068f78ed478ea397d232c47d9c98bdaac7 Mon Sep 17 00:00:00 2001 From: Brendan Reilly Date: Mon, 22 Feb 2021 16:37:48 -0500 Subject: [PATCH 1/2] Pull Fedora container from Fedora registry We need to pull the image from here to avoid rate limiting from dockerhub --- docker/Dockerfile-tests-py3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile-tests-py3 b/docker/Dockerfile-tests-py3 index ab989b65..c689c20d 100644 --- a/docker/Dockerfile-tests-py3 +++ b/docker/Dockerfile-tests-py3 @@ -1,4 +1,4 @@ -FROM fedora:latest +FROM registry.fedoraproject.org/fedora:latest WORKDIR /build RUN dnf -y install \ From addfd6d933b2ae213b5beb8de94a1b99b8b12f6e Mon Sep 17 00:00:00 2001 From: Brendan Reilly Date: Wed, 10 Mar 2021 11:40:51 -0500 Subject: [PATCH 2/2] Fix py2 dockerfile --- docker/Dockerfile-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests index 3037e4cc..a57498df 100644 --- a/docker/Dockerfile-tests +++ b/docker/Dockerfile-tests @@ -50,9 +50,9 @@ RUN yum -y install \ && yum clean all # We currently require newer versions of these Python packages for the tests. # more-itertools is required by pytest, but versions 6.0.0 and up aren't Python 2 compatible -RUN pip install --upgrade "pytest<5.0" flake8 tox pip "more-itertools<6.0.0" pytest-cov +RUN pip install --upgrade "pytest<5.0" flake8 tox "more-itertools<6.0.0" pytest-cov "importlib_metadata<=2.0.0" "configparser<5" "importlib_resources<4.0.0" # Install zipp as a workaround for https://github.com/pypa/virtualenv/issues/1630 -RUN pip install zipp +RUN pip install "zipp==1.0.0" VOLUME /src WORKDIR /src ENTRYPOINT ["docker/test.sh"]