Merge pull request #424 from cglewis/master

cglewis · web-flow · commit 1f54d77fea3e · 2021-05-20T13:10:05.000-07:00
release v0.11.22
diff --git a/mercury/VERSION b/mercury/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/network_tap/VERSION b/network_tap/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/network_tap/ncapture/VERSION b/network_tap/ncapture/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/network_tap/ncontrol/paths.py b/network_tap/ncontrol/paths.py
@@ -83,7 +83,7 @@ def on_post(self, req, resp):
             cmd += ' ' + payload['id'] + ' ' + payload['iters'] + ' "'
             cmd += payload['filter'] + '"'
             try:
-                container = c.containers.run(image='iqtlabs/ncapture:v0.11.21',
+                container = c.containers.run(image='iqtlabs/ncapture:v0.11.22',
                                              command=cmd, remove=remove, detach=True, **tool_d)
                 resp.text = "(True, 'successfully created and started filter: " + \
                     str(payload['id']) + ' on container: ' + \
@@ -187,7 +187,7 @@ def on_get(self, req, resp):
             for c in containers.containers.list(all=True):
                 # TODO: maybe find a way to not have to hard code image name
                 if c.attrs['Config']['Image'] == \
-                        'iqtlabs/ncapture:v0.11.21':
+                        'iqtlabs/ncapture:v0.11.22':
                     lst = {}
                     lst['id'] = c.attrs['Id'][:12]
                     lst['status'] = c.attrs['State']['Status']
diff --git a/p0f/Dockerfile b/p0f/Dockerfile
@@ -1,4 +1,4 @@
-FROM iqtlabs/rbqwrapper:v0.11.21
+FROM iqtlabs/rbqwrapper:v0.11.22
 LABEL maintainer="Charlie Lewis <clewis@iqt.org>"
 
 ENV DEBIAN_FRONTEND noninteractive
diff --git a/p0f/VERSION b/p0f/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/p0f/test_app.py b/p0f/test_app.py
@@ -35,14 +35,14 @@ def test_result_json():
         'ipv6_addresses': {'::1': {'mac': '00:00:00:00:00:00', 'raw_mtu': '65536'}}},
         'file_path': '/home/runner/work/network-tools/network-tools/p0f/test_lo.cap',
         'id': '',
-        'results': {'tool': 'p0f', 'version': '0.11.22.dev'}, 'tool': 'p0f',
-        'type': 'metadata', 'version': '0.11.22.dev'},
+        'results': {'tool': 'p0f', 'version': '0.11.22'}, 'tool': 'p0f',
+        'type': 'metadata', 'version': '0.11.22'},
     {
         'data': '',
         'file_path': '/home/runner/work/network-tools/network-tools/p0f/test_lo.cap',
         'id': '',
         'results': {'tool': 'p0f',
-        'version': '0.11.22.dev'},
+        'version': '0.11.22'},
         'tool': 'p0f',
         'type': 'metadata'}]
 
diff --git a/pcap_stats/VERSION b/pcap_stats/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/pcap_to_node_pcap/VERSION b/pcap_to_node_pcap/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/snort/VERSION b/snort/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22
diff --git a/tcprewrite_dot1q/VERSION b/tcprewrite_dot1q/VERSION
@@ -1 +1 @@
-0.11.22.dev
+0.11.22

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM iqtlabs/rbqwrapper:v0.11.21`
	`1`	`+FROM iqtlabs/rbqwrapper:v0.11.22`
`2`	`2`	`LABEL maintainer="Charlie Lewis <[email protected]>"`
`3`	`3`
`4`	`4`	`ENV DEBIAN_FRONTEND noninteractive`