From b2f98d2ba68d2f39f522669f13a57d22e606aeca Mon Sep 17 00:00:00 2001
From: Sebastian Waldbauer <waldbauer@cert.at>
Date: Fri, 26 Mar 2021 11:32:27 +0100
Subject: [PATCH] REL: 2.3.1 intelmq release

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
---
 build.sh        |  2 +-
 intelmq         |  2 +-
 intelmq-api     |  2 +-
 intelmq-manager |  2 +-
 publish.sh      | 15 ++++++++++-----
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index 6f0f5f3..fb0edca 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@ build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 git_ref_core=$(cd ./intelmq && git rev-parse --short HEAD)
 git_ref_manager=$(cd ./intelmq-manager && git rev-parse --short HEAD)
 git_ref_api=$(cd ./intelmq-api && git rev-parse --short HEAD)
-build_version="1.0"
+build_version="2.3.1"
 
 echo Building new IntelMQ-Image v$build_version
 echo Core      : $git_ref_core
diff --git a/intelmq b/intelmq
index 1d9ef49..0ecf90b 160000
--- a/intelmq
+++ b/intelmq
@@ -1 +1 @@
-Subproject commit 1d9ef4979fe259288f88dc40dfa7b134b18d3ebc
+Subproject commit 0ecf90b739bdd0552c6fefbba7eba90a9e0fc18d
diff --git a/intelmq-api b/intelmq-api
index 7a0f4b0..1780596 160000
--- a/intelmq-api
+++ b/intelmq-api
@@ -1 +1 @@
-Subproject commit 7a0f4b0324acdcf557ea1ca835063e73c6385ef1
+Subproject commit 17805961b7a12f7f124cd1e1295c64784eb2ac11
diff --git a/intelmq-manager b/intelmq-manager
index a89ac0d..d0086ca 160000
--- a/intelmq-manager
+++ b/intelmq-manager
@@ -1 +1 @@
-Subproject commit a89ac0de1fdf990fe2d02659148b12d83ae5ac7c
+Subproject commit d0086ca2fe573257833b52ab8f5330ee0e4048ce
diff --git a/publish.sh b/publish.sh
index 59e7c01..c142bed 100755
--- a/publish.sh
+++ b/publish.sh
@@ -1,12 +1,17 @@
 #!/bin/bash
-build_version="1.0"
+build_version="2.3.1"
+namespace="certat"
 
 docker login
 
-docker tag intelmq-nginx:latest certat/intelmq-nginx:latest
+docker tag intelmq-nginx:latest $namespace/intelmq-nginx:latest
 
-docker push certat/intelmq-nginx:latest
+docker push $namespace/intelmq-nginx:latest
 
-docker tag intelmq-full:latest certat/intelmq-full:latest
+docker tag intelmq-full:latest $namespace/intelmq-full:latest
+docker tag intelmq-full:latest $namespace/intelmq-full:1.0
+docker tag intelmq-full:latest $namespace/intelmq-full:$build_version
 
-docker push certat/intelmq-full:latest
+docker push $namespace/intelmq-full:latest
+docker push $namespace/intelmq-full:1.0
+docker push $namespace/intelmq-full:$build_version