From 7b969ec991b5872e1de670afcb1d936f3664e6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Thu, 6 Aug 2020 22:21:07 +0200
Subject: [PATCH 1/4] use ai base image

---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 715c233..3c4f0f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,4 @@
-FROM python:3.8
-
-RUN apt update && apt install -y libsndfile1-dev libsndfile1 && apt clean
+FROM registry.kmlabz.com/birbnetes/ai-base-image
 
 ENV PIP_NO_CACHE_DIR=true
 ENV TZ Europe/Budapest

From e7e6acd0b9c020ffc442785bd5513527679f4795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Thu, 6 Aug 2020 23:48:04 +0200
Subject: [PATCH 2/4] log to stdout

---
 cnn_classification_service/main.py |  2 +-
 docker-compose.yml                 | 36 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 docker-compose.yml

diff --git a/cnn_classification_service/main.py b/cnn_classification_service/main.py
index 9dadc51..e234b02 100644
--- a/cnn_classification_service/main.py
+++ b/cnn_classification_service/main.py
@@ -24,7 +24,7 @@ def message_callback(ch, method, properties, body):
 
 
 def main():
-    logging.basicConfig(filename="", format="%(asctime)s - %(name)s [%(levelname)s]: %(message)s",
+    logging.basicConfig(stream=sys.stdout, filename="", format="%(asctime)s - %(name)s [%(levelname)s]: %(message)s",
                         level=logging.DEBUG if '--debug' in sys.argv else logging.INFO)
 
     SENTRY_DSN = os.environ.get("SENTRY_DSN")
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..ff62cae
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,36 @@
+version: '3.4'
+
+networks:
+  cnn:
+    external: false
+
+services:
+  rabbitmq:
+    image: "rabbitmq:3"
+    hostname: "test-rabbitmq"
+    environment:
+      RABBITMQ_ERLANG_COOKIE: "akjahsfvbkueasnvfjkhsga"
+      RABBITMQ_DEFAULT_USER: "rabbitmq"
+      RABBITMQ_DEFAULT_PASS: "rabbitmq"
+      RABBITMQ_DEFAULT_VHOST: "/"
+    networks:
+      - cnn
+    ports:
+      - "127.0.0.1:15672:15672"
+      - "127.0.0.1:5672:5672"
+
+  cnc-service:
+    image: registry.kmlabz.com/birbnetes/activemq-artemis
+    restart: always
+    depends_on:
+      - activemq
+      - postgres
+    environment:
+      SENTRY_DSN: https://094270eeb6a7450ead80e87d04cd7552@sentry.kmlabz.com/4
+      RELEASE_ID: compose
+      RELEASEMODE: dev
+      PIKA_URL: amqp://rabbitmq:rabbitmq@rabbitmq:5672/
+      PIKA_INPUT_EXCHANGE: wave
+      PIKA_OUTPUT_EXCHANGE: sample
+    networks:
+      - cnn

From 1dc616412fb85ea437926b123cc99ed30e2442fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Fri, 7 Aug 2020 00:02:07 +0200
Subject: [PATCH 3/4] do not use filename in logging.basicconfig

---
 cnn_classification_service/main.py | 2 +-
 docker-compose.yml                 | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cnn_classification_service/main.py b/cnn_classification_service/main.py
index e234b02..84b7d5f 100644
--- a/cnn_classification_service/main.py
+++ b/cnn_classification_service/main.py
@@ -24,7 +24,7 @@ def message_callback(ch, method, properties, body):
 
 
 def main():
-    logging.basicConfig(stream=sys.stdout, filename="", format="%(asctime)s - %(name)s [%(levelname)s]: %(message)s",
+    logging.basicConfig(stream=sys.stdout, format="%(asctime)s - %(name)s [%(levelname)s]: %(message)s",
                         level=logging.DEBUG if '--debug' in sys.argv else logging.INFO)
 
     SENTRY_DSN = os.environ.get("SENTRY_DSN")
diff --git a/docker-compose.yml b/docker-compose.yml
index ff62cae..29880dc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,12 +19,11 @@ services:
       - "127.0.0.1:15672:15672"
       - "127.0.0.1:5672:5672"
 
-  cnc-service:
-    image: registry.kmlabz.com/birbnetes/activemq-artemis
+  cnn-service:
+    image: registry.kmlabz.com/birbnetes/cnn-classification-service
     restart: always
     depends_on:
-      - activemq
-      - postgres
+      - rabbitmq
     environment:
       SENTRY_DSN: https://094270eeb6a7450ead80e87d04cd7552@sentry.kmlabz.com/4
       RELEASE_ID: compose

From b12d29df161d3531387e49fb2dc3d79620805d62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torma=20Krist=C3=B3f?= <tormakristof@tormakristof.eu>
Date: Fri, 7 Aug 2020 00:20:09 +0200
Subject: [PATCH 4/4] update compose

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 29880dc..7672880 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   rabbitmq:
-    image: "rabbitmq:3"
+    image: "rabbitmq:3-management"
     hostname: "test-rabbitmq"
     environment:
       RABBITMQ_ERLANG_COOKIE: "akjahsfvbkueasnvfjkhsga"