Skip to content

Commit

Permalink
Merge pull request #1694 from anarkiwi/rel
Browse files Browse the repository at this point in the history
Release 0.12.2.
  • Loading branch information
anarkiwi authored May 20, 2020
2 parents 8673de6 + 841a289 commit 201814d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v0.12.2 (2020-05-21)

- Fix API not updated with networkml/p0f results.
- Update pytest, redis, faucet, gauge, pytype, grafana.


# v0.12.1 (2020-05-08)

- networkml 0.5.4 (can return multiple results)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.2.dev
0.12.2
19 changes: 5 additions & 14 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ version: '3.7'
services:
redis:
restart: always
image: 'cyberreboot/redis:latest'
image: 'cyberreboot/redis:v0.12.2'
volumes:
- '${POSEIDON_PREFIX}/opt/redis:/data'
networks:
poseidon:
rabbit:
restart: always
image: 'cyberreboot/rabbitmq:latest'
image: 'cyberreboot/rabbitmq:v0.12.2'
ports:
- '127.0.0.1:15672:15672'
- '5672:5672'
Expand Down Expand Up @@ -41,7 +41,7 @@ services:
- poseidon
poseidon_api:
restart: always
image: 'cyberreboot/poseidon-api:latest'
image: 'cyberreboot/poseidon-api:v0.12.2'
ports:
- '5000:8000'
environment:
Expand All @@ -52,12 +52,9 @@ services:
- poseidon-api
depends_on:
- poseidon
build:
context: api
dockerfile: Dockerfile
poseidon:
restart: always
image: 'cyberreboot/poseidon:latest'
image: 'cyberreboot/poseidon:v0.12.2'
environment:
PYTHONUNBUFFERED: '1'
volumes:
Expand All @@ -70,12 +67,9 @@ services:
depends_on:
- rabbit
- redis
build:
context: .
dockerfile: Dockerfile
workers:
restart: always
image: 'cyberreboot/poseidon-workers:latest'
image: 'cyberreboot/poseidon-workers:v0.12.2'
environment:
PYTHONUNBUFFERED: '1'
KEEPIMAGES: '0'
Expand All @@ -86,8 +80,5 @@ services:
- '/var/run/docker.sock:/var/run/docker.sock'
depends_on:
- poseidon
build:
context: workers
dockerfile: Dockerfile
networks:
poseidon:

0 comments on commit 201814d

Please sign in to comment.