From 645b659d7bc7cfc1f2389ba36ec0175a1db7d726 Mon Sep 17 00:00:00 2001 From: Matthias Tafelmeier Date: Thu, 2 Feb 2023 13:47:09 +0100 Subject: [PATCH] stop building from fork Upstream merged install of ss2 as module. --- Dockerfile | 8 -------- setup.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2244f23..54f95e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,14 +13,6 @@ RUN set -ex \ && cd /prometheus-ss-exporter \ && python3 setup.py install -# install ss2 from forked pyroute2 -RUN /bin/bash -c "git clone https://github.com/cherusk/pyroute2.git \ - && pushd pyroute2 \ - && git checkout -B install_ss2_as_module origin/install_ss2_as_module \ - && python3 setup.py install \ - && popd \ - && rmdir --ignore-fail-on-non-empty pyroute2" - EXPOSE 8090 USER root diff --git a/setup.py b/setup.py index c940c5f..02387f4 100644 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ packages=find_packages(), install_requires=[ - # 'pyroute2==0.5.19', installed from fork for now + 'pyroute2==0.7.4', 'prometheus-client', 'PyYAML', 'psutil'