diff options
| author | Jernej Jakob <jernej.jakob@gmail.com> | 2020-02-29 03:02:56 +0100 |
|---|---|---|
| committer | Jernej Jakob <jernej.jakob@gmail.com> | 2020-02-29 03:02:56 +0100 |
| commit | 1c4414dd363bdb268038ae238686be3e0b7f988b (patch) | |
| tree | 39d9daa03f2766b7e5bea99b4f845d1a438686ce | |
| parent | 0d983fb9be0e63e9af1ddca8ab714a62e360c87d (diff) | |
| download | vyos-build-1c4414dd363bdb268038ae238686be3e0b7f988b.tar.gz vyos-build-1c4414dd363bdb268038ae238686be3e0b7f988b.zip | |
T2085: remove conntrack-tools and dependencies
| -rw-r--r-- | docker/Dockerfile | 7 | ||||
| -rwxr-xr-x | scripts/build-packages | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b4c60a50..c92c2b84 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -218,13 +218,6 @@ RUN apt-get update && apt-get install -y \ python3-pytest \ texinfo -# Packages needed for conntrack-tools -RUN apt-get update && apt-get install -y \ - libnetfilter-conntrack-dev \ - libnetfilter-cthelper0-dev \ - libnetfilter-cttimeout-dev \ - libnetfilter-queue-dev - # Packages needed for hvinfo RUN apt-get update && apt-get install -y \ gnat \ diff --git a/scripts/build-packages b/scripts/build-packages index ce371175..953f1d05 100755 --- a/scripts/build-packages +++ b/scripts/build-packages @@ -195,8 +195,7 @@ vyos_packages = ['vyatta-bash', 'vyos-xe-guest-utilities', 'vyos-netplug', 'ddclient', - 'live-boot', - 'conntrack-tools'] + 'live-boot'] # Special packages mean packages which are located no in the VyOS namespace # or require fancy build instructions |