Merge 3a859e3 into 296bc3e

tahoe-lafs · Feb 15, 2022 · aca12c9 · aca12c9
2 parents 296bc3e + 3a859e3
commit aca12c9
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 277 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.