Skip to content

Commit 6ab2cae

Browse files
cglewiscglewis
authored
Merge pull request #1263 from rashley-iqt/master
release 0.6.5
2 parents 9f64430 + 9f8a8be commit 6ab2cae

File tree

10 files changed

+110
-101
lines changed

10 files changed

+110
-101
lines changed

‎.vent_startup.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,61 @@
11
https://github.com/cyberreboot/vent:
22
file_drop:
3-
branch: v0.9.5
3+
branch: v0.9.6
44
build: yes
55
start: yes
66
network_tap:
7-
branch: v0.9.5
7+
branch: v0.9.6
88
build: yes
99
start: yes
1010
rabbitmq:
11-
branch: v0.9.5
11+
branch: v0.9.6
1212
build: yes
1313
start: yes
1414
redis:
15-
branch: v0.9.5
15+
branch: v0.9.6
1616
build: yes
1717
start: yes
1818
rq_dashboard:
19-
branch: v0.9.5
19+
branch: v0.9.6
2020
build: yes
2121
start: yes
2222
rq_worker:
23-
branch: v0.9.5
23+
branch: v0.9.6
2424
build: yes
2525
start: yes
2626
settings:
2727
instances: 4
2828
syslog:
29-
branch: v0.9.5
29+
branch: v0.9.6
3030
build: yes
3131
start: yes
3232
https://github.com/cyberreboot/poseidon:
3333
'@':
34-
branch: v0.6.4
34+
branch: v0.6.5
3535
build: yes
3636
start: yes
3737
api:
38-
branch: v0.6.4
38+
branch: v0.6.5
3939
build: yes
4040
start: yes
4141
https://github.com/cyberreboot/vent-plugins:
4242
pcap_to_node_pcap:
43-
branch: v0.1.1
43+
branch: v0.1.2
4444
build: yes
4545
p0f:
46-
branch: v0.1.1
46+
branch: v0.1.2
4747
build: yes
4848
tcprewrite_dot1q:
49-
branch: v0.1.1
49+
branch: v0.1.2
5050
build: yes
5151
https://github.com/cyberreboot/crviz:
5252
'@':
53-
branch: v0.3.6
53+
branch: v0.3.8
5454
build: yes
5555
start: yes
5656
https://github.com/cyberreboot/networkml:
5757
'@':
58-
branch: v0.3.4
58+
branch: v0.3.5
5959
build: yes
6060
vent.cfg:
6161
build-options:

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# v0.6.5 (2019-08-02)
2+
3+
- Updated versions of cmd2, pika, redis, and pyyaml
4+
- introduced release scripts
5+
16
# v0.6.4 (2019-07-12)
27

38
- Updated versions of cmd2, pytest, flask, and texttable

‎Makefile‎

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,38 @@ build_debian:
3333
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
3434
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
3535
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
36-
docker pull cyberreboot/vent:v0.9.5
37-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.5
38-
docker pull cyberreboot/vent-file-drop:v0.9.5
39-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.5
40-
docker pull cyberreboot/vent-network-tap:v0.9.5
41-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.5
42-
docker pull cyberreboot/vent-rabbitmq:v0.9.5
43-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.5
44-
docker pull cyberreboot/vent-redis:v0.9.5
45-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.5
46-
docker pull cyberreboot/vent-rq-dashboard:v0.9.5
47-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.5
48-
docker pull cyberreboot/vent-rq-worker:v0.9.5
49-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.5
50-
docker pull cyberreboot/vent-syslog:v0.9.5
51-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.5
52-
docker pull cyberreboot/poseidon-api:v0.6.4
53-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.6.4
54-
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
55-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
56-
docker pull cyberreboot/vent-plugins-p0f:v0.1.1
57-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.1
58-
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
59-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
60-
docker pull cyberreboot/crviz:v0.3.6
61-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.6
62-
docker pull cyberreboot/networkml:v0.3.4
63-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-networkml.tar cyberreboot/networkml:v0.3.4
64-
docker pull cyberreboot/poseidon:v0.6.4
65-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.6.4
36+
docker pull cyberreboot/vent:v0.9.6
37+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.6
38+
39+
docker pull cyberreboot/poseidon:v0.6.5
40+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon.tar cyberreboot/poseidon:v0.6.5
41+
docker pull cyberreboot/networkml:v0.3.5
42+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-networkml.tar cyberreboot/networkml:v0.3.5
43+
docker pull cyberreboot/vent-file-drop:v0.9.6
44+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-file-drop.tar cyberreboot/vent-file-drop:v0.9.6
45+
docker pull cyberreboot/vent-rabbitmq:v0.9.6
46+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar cyberreboot/vent-rabbitmq:v0.9.6
47+
docker pull cyberreboot/vent-syslog:v0.9.6
48+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-syslog.tar cyberreboot/vent-syslog:v0.9.6
49+
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.2
50+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.2
51+
docker pull cyberreboot/vent-rq-worker:v0.9.6
52+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-worker.tar cyberreboot/vent-rq-worker:v0.9.6
53+
docker pull cyberreboot/vent-network-tap:v0.9.6
54+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-network-tap.tar cyberreboot/vent-network-tap:v0.9.6
55+
docker pull cyberreboot/crviz:v0.3.8
56+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-crviz.tar cyberreboot/crviz:v0.3.8
57+
docker pull cyberreboot/poseidon-api:v0.6.5
58+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-poseidon-api.tar cyberreboot/poseidon-api:v0.6.5
59+
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.2
60+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.2
61+
docker pull cyberreboot/vent-redis:v0.9.6
62+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-redis.tar cyberreboot/vent-redis:v0.9.6
63+
docker pull cyberreboot/vent-rq-dashboard:v0.9.6
64+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar cyberreboot/vent-rq-dashboard:v0.9.6
65+
docker pull cyberreboot/vent-plugins-p0f:v0.1.2
66+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar cyberreboot/vent-plugins-p0f:v0.1.2
67+
6668
mkdir -p dist
6769
docker build -t poseidon-dpkg -f Dockerfile.dpkg .
6870
docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION).deb
@@ -89,8 +91,9 @@ build_debian_net:
8991
cp .vent_startup.yml installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9092
cp -R .git installers/debian/$(TAG)-$(VERSION)/opt/poseidon/
9193
cp -R bin/* installers/debian/$(TAG)-$(VERSION)/usr/bin/
92-
docker pull cyberreboot/vent:v0.9.5
93-
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.5
94+
docker pull cyberreboot/vent:v0.9.6
95+
docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/cyberreboot-vent.tar cyberreboot/vent:v0.9.6
96+
9497
mkdir -p dist
9598
docker build -t poseidon-dpkg --build-arg PKG_NAME=poseidon-net -f Dockerfile.dpkg .
9699
docker run --rm poseidon-dpkg > dist/$(TAG)-$(VERSION)-net.deb

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ NEW: If you have used the .DEB installer previously, it is worth noting that Pos
153153
After installation you'll have a new command `poseidon` available for looking at the status, logs, changing the configuration, or stopping and starting the service.
154154
```
155155
$ poseidon help
156-
Poseidon 0.6.4, an application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of machine learning techniques. For more info visit: https://github.com/CyberReboot/poseidon
156+
Poseidon 0.6.5, an application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of machine learning techniques. For more info visit: https://github.com/CyberReboot/poseidon
157157
158158
Usage: poseidon [option]
159159
Options:

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.6.5.dev
1+
0.6.5

‎bin/poseidon‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function check_args()
134134
echo "Checking volumes..."
135135
check_files
136136
echo "Starting Poseidon..."
137-
docker run -dit --rm -v /var/run/docker.sock:/var/run/docker.sock -v /opt/vent_files:/opt/vent_files -v /opt/poseidon/.plugin_config.yml:/root/.plugin_config.yml -v /opt/poseidon/.vent_startup.yml:/root/.vent_startup.yml --env-file /etc/poseidon/default.conf --name vent cyberreboot/vent:v0.9.5
137+
docker run -dit --rm -v /var/run/docker.sock:/var/run/docker.sock -v /opt/vent_files:/opt/vent_files -v /opt/poseidon/.plugin_config.yml:/root/.plugin_config.yml -v /opt/poseidon/.vent_startup.yml:/root/.vent_startup.yml --env-file /etc/poseidon/default.conf --name vent cyberreboot/vent:v0.9.6
138138
until [ "$(docker ps -q -f name=-poseidon-)" ] && [ "$(docker ps -q -f name=-poseidon- | head -1 | xargs docker container inspect -f \{\{.State.Health.Status\}\})" = "healthy" ]
139139
do
140140
# TODO do more checks and be verbose in here

‎installers/debian/control‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Package: poseidon
2-
Version: 0.6.5.dev
2+
Version: 0.6.5
33
Section: base
44
Priority: optional
55
Architecture: all
66
Depends: debconf (>= 1.5.0), mininet (>= 2.2.1), netcat-openbsd
77
Maintainer: Charlie Lewis <[email protected]>
88
Description: Poseidon
9-
Poseidon is a python-based application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of machine learning techniques. The machine learning algorithms classify and predict both the type of device and if the device is acting normally or abnormally.
9+
Poseidon is a python-based application that leverages software defined networks (SDN) to acquire and then feed network traffic to a number of machine learning techniques. The machine learning algorithms classify and predict both the type of device and if the device is acting normally or abnormally.

‎installers/debian/postinst‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -239,81 +239,82 @@ if db_go; then
239239

240240
# load or pull required images
241241
if [ ! -f /opt/poseidon/dist/cyberreboot-vent.tar ]; then
242-
docker pull cyberreboot/vent:v0.9.5
242+
docker pull cyberreboot/vent:v0.9.6
243243
else
244244
docker load -i /opt/poseidon/dist/cyberreboot-vent.tar
245245
fi
246-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-file-drop.tar ]; then
247-
docker pull cyberreboot/vent-file-drop:v0.9.5
246+
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
247+
docker pull cyberreboot/poseidon:v0.6.5
248248
else
249-
docker load -i /opt/poseidon/dist/cyberreboot-vent-file-drop.tar
249+
docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
250250
fi
251-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-network-tap.tar ]; then
252-
docker pull cyberreboot/vent-network-tap:v0.9.5
251+
if [ ! -f /opt/poseidon/dist/cyberreboot-networkml.tar ]; then
252+
docker pull cyberreboot/networkml:v0.3.5
253253
else
254-
docker load -i /opt/poseidon/dist/cyberreboot-vent-network-tap.tar
254+
docker load -i /opt/poseidon/dist/cyberreboot-networkml.tar
255+
fi
256+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-file-drop.tar ]; then
257+
docker pull cyberreboot/vent-file-drop:v0.9.6
258+
else
259+
docker load -i /opt/poseidon/dist/cyberreboot-vent-file-drop.tar
255260
fi
256261
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar ]; then
257-
docker pull cyberreboot/vent-rabbitmq:v0.9.5
262+
docker pull cyberreboot/vent-rabbitmq:v0.9.6
258263
else
259264
docker load -i /opt/poseidon/dist/cyberreboot-vent-rabbitmq.tar
260265
fi
261-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-redis.tar ]; then
262-
docker pull cyberreboot/vent-redis:v0.9.5
266+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-syslog.tar ]; then
267+
docker pull cyberreboot/vent-syslog:v0.9.6
263268
else
264-
docker load -i /opt/poseidon/dist/cyberreboot-vent-redis.tar
269+
docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
265270
fi
266-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar ]; then
267-
docker pull cyberreboot/vent-rq-dashboard:v0.9.5
271+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar ]; then
272+
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.2
268273
else
269-
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar
274+
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar
270275
fi
271276
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar ]; then
272-
docker pull cyberreboot/vent-rq-worker:v0.9.5
277+
docker pull cyberreboot/vent-rq-worker:v0.9.6
273278
else
274279
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-worker.tar
275280
fi
276-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-syslog.tar ]; then
277-
docker pull cyberreboot/vent-syslog:v0.9.5
278-
else
279-
docker load -i /opt/poseidon/dist/cyberreboot-vent-syslog.tar
280-
fi
281-
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
282-
docker pull cyberreboot/poseidon-api:v0.6.4
281+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-network-tap.tar ]; then
282+
docker pull cyberreboot/vent-network-tap:v0.9.6
283283
else
284-
docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
284+
docker load -i /opt/poseidon/dist/cyberreboot-vent-network-tap.tar
285285
fi
286-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar ]; then
287-
docker pull cyberreboot/vent-plugins-pcap-to-node-pcap:v0.1.1
286+
if [ ! -f /opt/poseidon/dist/cyberreboot-crviz.tar ]; then
287+
docker pull cyberreboot/crviz:v0.3.8
288288
else
289-
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-pcap-to-node-pcap.tar
289+
docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
290290
fi
291-
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar ]; then
292-
docker pull cyberreboot/vent-plugins-p0f:v0.1.1
291+
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon-api.tar ]; then
292+
docker pull cyberreboot/poseidon-api:v0.6.5
293293
else
294-
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar
294+
docker load -i /opt/poseidon/dist/cyberreboot-poseidon-api.tar
295295
fi
296296
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar ]; then
297-
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.1
297+
docker pull cyberreboot/vent-plugins-tcprewrite-dot1q:v0.1.2
298298
else
299299
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-tcprewrite-dot1q.tar
300300
fi
301-
if [ ! -f /opt/poseidon/dist/cyberreboot-crviz.tar ]; then
302-
docker pull cyberreboot/crviz:v0.3.6
301+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-redis.tar ]; then
302+
docker pull cyberreboot/vent-redis:v0.9.6
303303
else
304-
docker load -i /opt/poseidon/dist/cyberreboot-crviz.tar
304+
docker load -i /opt/poseidon/dist/cyberreboot-vent-redis.tar
305305
fi
306-
if [ ! -f /opt/poseidon/dist/cyberreboot-networkml.tar ]; then
307-
docker pull cyberreboot/networkml:v0.3.4
306+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar ]; then
307+
docker pull cyberreboot/vent-rq-dashboard:v0.9.6
308308
else
309-
docker load -i /opt/poseidon/dist/cyberreboot-networkml.tar
309+
docker load -i /opt/poseidon/dist/cyberreboot-vent-rq-dashboard.tar
310310
fi
311-
if [ ! -f /opt/poseidon/dist/cyberreboot-poseidon.tar ]; then
312-
docker pull cyberreboot/poseidon:v0.6.4
311+
if [ ! -f /opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar ]; then
312+
docker pull cyberreboot/vent-plugins-p0f:v0.1.2
313313
else
314-
docker load -i /opt/poseidon/dist/cyberreboot-poseidon.tar
314+
docker load -i /opt/poseidon/dist/cyberreboot-vent-plugins-p0f.tar
315315
fi
316316

317+
317318
# start poseidon service
318319
systemctl enable poseidon
319320
systemctl start poseidon

‎release/configuration.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,24 @@ def parse_cfg_from_yml(yml_dict):
3434

3535
# take the version of the
3636
if repo == "vent" and not "vent" in cfg_dict:
37-
cfg_dict["vent"] = {'repo': 'cyberreboot', 'version': branch}
37+
cfg_dict["vent"] = {'owner': owner, 'repo': 'vent', 'version': branch}
3838

39-
cfg_dict[tool] = {'repo': repo, 'version': branch}
39+
cfg_dict[tool] = {'owner': owner, 'repo': repo, 'version': branch}
4040

4141

4242

4343
return cfg_dict
4444

4545
def generate_makefile(cfg_dict):
4646
vent = cfg_dict["vent"]
47-
vent_cmd = "docker pull {0}/{1}:{2}\n\t".format(vent["repo"], "vent", vent["version"])
48-
vent_cmd += "docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/{0}-{1}.tar {0}/{1}:{2}\n\t".format(vent["repo"], "vent", vent["version"])
47+
vent_cmd = "docker pull {0}/{1}:{2}\n\t".format(vent["owner"], "vent", vent["version"])
48+
vent_cmd += "docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/{0}-{1}.tar {0}/{1}:{2}\n\t".format(vent["owner"], "vent", vent["version"])
4949

5050
tool_cmd = ""
5151
for key in list(cfg_dict.keys())[1:]:
5252
value = cfg_dict[key]
53-
tool_cmd += "docker pull {0}/{1}:{2}\n\t".format(value["repo"], key, value["version"])
54-
tool_cmd += "docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/{0}-{1}.tar {0}/{1}:{2}\n\t".format(value["repo"], key, value["version"])
53+
tool_cmd += "docker pull {0}/{1}:{2}\n\t".format(value["owner"], key, value["version"])
54+
tool_cmd += "docker save -o installers/debian/$(TAG)-$(VERSION)/opt/poseidon/dist/{0}-{1}.tar {0}/{1}:{2}\n\t".format(value["owner"], key, value["version"])
5555
cmds = vent_cmd + tool_cmd
5656
with open("./release/templates/make", "r") as tf:
5757
temp_str = tf.read()
@@ -65,10 +65,10 @@ def generate_deb_postinst(cfg_dict):
6565
tool_cmd = ""
6666
for key in cfg_dict.keys():
6767
value = cfg_dict[key]
68-
tool_cmd += " if [ ! -f /opt/poseidon/dist/{0}-{1}.tar ]; then\n".format(value["repo"], key)
69-
tool_cmd += " docker pull {0}/{1}:{2}\n".format(value["repo"], key, value["version"])
68+
tool_cmd += " if [ ! -f /opt/poseidon/dist/{0}-{1}.tar ]; then\n".format(value["owner"], key)
69+
tool_cmd += " docker pull {0}/{1}:{2}\n".format(value["owner"], key, value["version"])
7070
tool_cmd += " else\n"
71-
tool_cmd += " docker load -i /opt/poseidon/dist/{0}-{1}.tar\n".format(value["repo"], key)
71+
tool_cmd += " docker load -i /opt/poseidon/dist/{0}-{1}.tar\n".format(value["owner"], key)
7272
tool_cmd += " fi\n"
7373

7474
with open("./release/templates/deb_postinst", "r") as dp:
@@ -102,7 +102,7 @@ def generate_readme(poseidon_version):
102102
rf.write(replaced)
103103

104104
def generate_bin_poseidon(vent_data):
105-
vent_slug = "{0}/{1}:{2}".format(vent_data["repo"], "vent", vent_data["version"])
105+
vent_slug = "{0}/{1}:{2}".format(vent_data["owner"], "vent", vent_data["version"])
106106
with open("./release/templates/bin_poseidon", "r") as bp:
107107
temp_str = bp.read()
108108
template = Template(temp_str)

0 commit comments

Comments
 (0)