Merge pull request #15 from cherusk/repair_ss2_install

streamline container build
cherusk · Feb 2, 2023 · 5d3440d · 5d3440d
2 parents d08dcd3 + 645b659
commit 5d3440d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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'