Merge remote-tracking branch 'origin/master' into 3860-http-more-immu…

…tables
tahoe-lafs · Feb 22, 2022 · 6dab065 · 6dab065
2 parents 5aa00ab + 2444c55
commit 6dab065
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 289 deletions.
diff --git a/.circleci/Dockerfile.debian b/.circleci/Dockerfile.debian
@@ -1,7 +1,7 @@
 ARG TAG
 FROM debian:${TAG}
 ARG PYTHON_VERSION
-
+ENV DEBIAN_FRONTEND noninteractive
 ENV WHEELHOUSE_PATH /tmp/wheelhouse
 ENV VIRTUALENV_PATH /tmp/venv
 # This will get updated by the CircleCI checkout step.

diff --git a/.circleci/Dockerfile.centos → .circleci/Dockerfile.oraclelinux b/.circleci/Dockerfile.centos → .circleci/Dockerfile.oraclelinux
@@ -1,5 +1,5 @@
 ARG TAG
-FROM centos:${TAG}
+FROM oraclelinux:${TAG}
 ARG PYTHON_VERSION
 
 ENV WHEELHOUSE_PATH /tmp/wheelhouse
@@ -13,7 +13,6 @@ RUN yum install --assumeyes \
     sudo \
     make automake gcc gcc-c++ \
     python${PYTHON_VERSION} \
-    python${PYTHON_VERSION}-devel \
     libffi-devel \
     openssl-devel \
     libyaml \

diff --git a/.circleci/Dockerfile.ubuntu b/.circleci/Dockerfile.ubuntu
@@ -1,7 +1,7 @@
 ARG TAG
 FROM ubuntu:${TAG}
 ARG PYTHON_VERSION
-
+ENV DEBIAN_FRONTEND noninteractive
 ENV WHEELHOUSE_PATH /tmp/wheelhouse
 ENV VIRTUALENV_PATH /tmp/venv
 # This will get updated by the CircleCI checkout step.