From 24b3eea2a051c7bc3433fd6ecb787d8054f20444 Mon Sep 17 00:00:00 2001
From: rjawor <rjawor@amu.edu.pl>
Date: Wed, 15 May 2019 21:19:00 +0200
Subject: [PATCH] added lemmagen

---
 Dockerfile => concordia-server/Dockerfile | 2 +-
 docker-compose.yml                        | 7 ++++++-
 lemmagen/Dockerfile                       | 6 ++++++
 todo                                      | 3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)
 rename Dockerfile => concordia-server/Dockerfile (60%)
 create mode 100644 lemmagen/Dockerfile

diff --git a/Dockerfile b/concordia-server/Dockerfile
similarity index 60%
rename from Dockerfile
rename to concordia-server/Dockerfile
index 858bd66..72acd2a 100644
--- a/Dockerfile
+++ b/concordia-server/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:16.04
 
 
-RUN apt-get update && apt-get install -y git libfcgi-dev libpq-dev mono-complete python3-psycopg2 nginx php apache2 libapache2-mod-php spawn-fcgi cmake g++ libboost-dev libboost-serialization-dev libboost-test-dev libboost-filesystem-dev libboost-system-dev libboost-program-options-dev libboost-iostreams-dev libboost-regex-dev libboost-locale-dev liblog4cpp5-dev libconfig++-dev libconfig-dev libpcre3-dev
+RUN apt-get update && apt-get install -y git libfcgi-dev libpq-dev python3-psycopg2 nginx php apache2 libapache2-mod-php spawn-fcgi cmake g++ libboost-dev libboost-serialization-dev libboost-test-dev libboost-filesystem-dev libboost-system-dev libboost-program-options-dev libboost-iostreams-dev libboost-regex-dev libboost-locale-dev liblog4cpp5-dev libconfig++-dev libconfig-dev libpcre3-dev
 RUN git clone https://git.code.sf.net/p/tmconcordia/code
 RUN cd code && mkdir build && cd build && ../cmake.sh && make && make install && ldconfig
 RUN git clone https://git.wmi.amu.edu.pl/rjawor/concordia-server.git
diff --git a/docker-compose.yml b/docker-compose.yml
index f0f25d9..816dbae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,12 @@ services:
       POSTGRES_PASSWORD: webpassword
       POSTGRES_DB: backend_db
   concordia-server:
-    build: .
+    build: ./concordia-server
     container_name: concordia-server
     ports:
       - "10002:80"
+
+  lemmagen:
+    build: ./lemmagen
+    container_name: lemmagen
+    restart: always
diff --git a/lemmagen/Dockerfile b/lemmagen/Dockerfile
new file mode 100644
index 0000000..55f5777
--- /dev/null
+++ b/lemmagen/Dockerfile
@@ -0,0 +1,6 @@
+ FROM ubuntu:16.04
+
+ RUN apt-get update && apt-get -y install git mono-runtime
+ RUN git clone https://git.wmi.amu.edu.pl/rjawor/lemmagen-wrapper.git
+
+ CMD mono /lemmagen-wrapper/LemmaGenSockets/LemmaGenSockets/bin/Debug/LemmaGenSockets.exe
\ No newline at end of file
diff --git a/todo b/todo
index 59f3bd3..22d25a1 100644
--- a/todo
+++ b/todo
@@ -1,4 +1,5 @@
 1. Change db settings in CMakeLists.txt in concordia-server repo
 2. Rebuild docker-compose and check if concordia-server connects to db via internal "docker-compose" network
 3. do not expose concordia-postgres ports if the above works
-4. Move scripts in the tests folder of concordia-server repo to the concordia-docker. Adjust them accordingly (host, port)
\ No newline at end of file
+4. Move scripts in the tests folder of concordia-server repo to the concordia-docker. Adjust them accordingly (host, port)
+5. sort out the lemmagen
\ No newline at end of file