diff --git a/ci/centos-7/Dockerfile b/ci/centos-7/Dockerfile index 759d08d19a..c5734f3653 100644 --- a/ci/centos-7/Dockerfile +++ b/ci/centos-7/Dockerfile @@ -38,13 +38,7 @@ RUN yum -y install \ which \ && yum clean all && rm -rf /var/cache/yum -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html RUN echo 'unset BASH_ENV PROMPT_COMMAND ENV' > /usr/bin/zeek-ci-env && \ echo 'source /opt/rh/devtoolset-7/enable' >> /usr/bin/zeek-ci-env diff --git a/ci/centos-8/Dockerfile b/ci/centos-8/Dockerfile index 9a9df30a1e..ecdde92664 100644 --- a/ci/centos-8/Dockerfile +++ b/ci/centos-8/Dockerfile @@ -26,10 +26,4 @@ RUN dnf -y update && dnf -y install \ which \ && dnf clean all && rm -rf /var/cache/dnf -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html diff --git a/ci/debian-10/Dockerfile b/ci/debian-10/Dockerfile index ea5a9ab0b3..a0f05b6f6a 100644 --- a/ci/debian-10/Dockerfile +++ b/ci/debian-10/Dockerfile @@ -25,10 +25,4 @@ RUN apt-get update && apt-get -y install \ xz-utils \ && rm -rf /var/lib/apt/lists/* -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html diff --git a/ci/debian-9-32bit/Dockerfile b/ci/debian-9-32bit/Dockerfile index 9ff5c2161d..3a6990216d 100644 --- a/ci/debian-9-32bit/Dockerfile +++ b/ci/debian-9-32bit/Dockerfile @@ -31,12 +31,6 @@ RUN apt-get update && apt-get -y install \ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang-7 100 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-7 100 -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html ENV CXXFLAGS=-stdlib=libc++ diff --git a/ci/debian-9/Dockerfile b/ci/debian-9/Dockerfile index e2dabd95d0..2fcde5fc01 100644 --- a/ci/debian-9/Dockerfile +++ b/ci/debian-9/Dockerfile @@ -28,13 +28,7 @@ RUN apt-get update && apt-get -y install \ libc++abi-7-dev \ && rm -rf /var/lib/apt/lists/* -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html ENV CC=/usr/bin/clang-7 ENV CXX=/usr/bin/clang++-7 diff --git a/ci/fedora-31/Dockerfile b/ci/fedora-31/Dockerfile index bc71a8a795..e9b24a9671 100644 --- a/ci/fedora-31/Dockerfile +++ b/ci/fedora-31/Dockerfile @@ -22,10 +22,4 @@ RUN yum -y install \ zlib-devel \ && yum clean all && rm -rf /var/cache/yum -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html diff --git a/ci/fedora-32/Dockerfile b/ci/fedora-32/Dockerfile index 80b833fdb3..87e072753c 100644 --- a/ci/fedora-32/Dockerfile +++ b/ci/fedora-32/Dockerfile @@ -22,10 +22,4 @@ RUN yum -y install \ zlib-devel \ && yum clean all && rm -rf /var/cache/yum -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html diff --git a/ci/fedora-33/Dockerfile b/ci/fedora-33/Dockerfile index 3124d85bf5..15d5f9244e 100644 --- a/ci/fedora-33/Dockerfile +++ b/ci/fedora-33/Dockerfile @@ -22,10 +22,4 @@ RUN yum -y install \ zlib-devel \ && yum clean all && rm -rf /var/cache/yum -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html diff --git a/ci/freebsd/prepare.sh b/ci/freebsd/prepare.sh index 097c25e243..0ec60513cf 100755 --- a/ci/freebsd/prepare.sh +++ b/ci/freebsd/prepare.sh @@ -9,5 +9,4 @@ env ASSUME_ALWAYS_YES=YES pkg bootstrap pkg install -y bash git cmake swig bison python3 base64 pyver=`python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")'` pkg install -y $pyver-sqlite3 $pyver-pip -( cd && mkdir -p ./bin && ln -s /usr/local/bin/python3 ./bin/python ) pip install junit2html diff --git a/ci/ubuntu-16.04/Dockerfile b/ci/ubuntu-16.04/Dockerfile index e094e584c5..5b65acd55f 100644 --- a/ci/ubuntu-16.04/Dockerfile +++ b/ci/ubuntu-16.04/Dockerfile @@ -28,13 +28,7 @@ RUN apt-get update && apt-get -y install \ xz-utils \ && rm -rf /var/lib/apt/lists/* -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html ENV CC=/usr/bin/clang-8 ENV CXX=/usr/bin/clang++-8 diff --git a/ci/ubuntu-18.04/Dockerfile b/ci/ubuntu-18.04/Dockerfile index e298595f39..ed5ecb3b8e 100644 --- a/ci/ubuntu-18.04/Dockerfile +++ b/ci/ubuntu-18.04/Dockerfile @@ -29,11 +29,5 @@ RUN apt-get update && apt-get -y install \ lcov \ && rm -rf /var/lib/apt/lists/* -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html RUN gem install coveralls-lcov diff --git a/ci/ubuntu-20.04/Dockerfile b/ci/ubuntu-20.04/Dockerfile index 3c48668794..74cf7b571e 100644 --- a/ci/ubuntu-20.04/Dockerfile +++ b/ci/ubuntu-20.04/Dockerfile @@ -29,11 +29,5 @@ RUN apt-get update && apt-get -y install \ lcov \ && rm -rf /var/lib/apt/lists/* -# Many distros adhere to PEP 394's recommendation for `python` = `python2` so -# this is a simple workaround until we drop Python 2 support and explicitly -# use `python3` for all invocations (e.g. in shebangs). -RUN ln -sf /usr/bin/python3 /usr/local/bin/python -RUN ln -sf /usr/bin/pip3 /usr/local/bin/pip - -RUN pip install junit2html +RUN pip3 install junit2html RUN gem install coveralls-lcov