From 62ca03495f42350d2924a6c49b75a7f217f3cf8f Mon Sep 17 00:00:00 2001
From: www <bofh@fet.at>
Date: Fri, 25 Dec 2020 21:36:37 +0000
Subject: [PATCH] add etherpad and nginx services

---
 docker-compose.yml | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 139232d..915c9a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   solr:
     image: my_fet_solr
-    build: ./solr_server
+    build: ./services/solr_server
     ports:
      - "8980:8983"
     volumes:
@@ -13,7 +13,7 @@ services:
       - /opt/solr/server/solr/configsets/fetconfig
   solrprotocol:
     image: my_fet_solr
-    build: ./solr_server
+    build: ./services/solr_server
     ports:
      - "8980:8983"
     volumes:
@@ -22,7 +22,41 @@ services:
       - solr-precreate 
       - core 
       - /opt/solr/server/solr/configsets/fetconfig
-      
+  etherpadsql:
+    image: jbergstroem/mariadb-alpine
+    environment:
+      SKIP_INNODB: "no"
+      MYSQL_DATABASE: etherpaddb
+      MYSQL_USER: user
+      MYSQL_PASSWORD: hgu
+      MYSQL_COLLATION: utf8_general_ci
+      MYSQL_CHARSET: utf8
+    volumes:
+     - ep-mysql-volume:/var/lib/mysql
+  etherpad:
+    image: etherpad/etherpad
+    environment:
+      DB_TYPE: mysql
+      DB_HOST: etherpadsql
+      DB_PORT: 3306
+      DB_NAME: etherpaddb
+      DB_USER: user
+      DB_PASS: hgu
+      DB_CHARSET: utf8
+      TRUST_PROXY: "true"
+      REQUIRE_SESSION: "true"
+    depends_on:
+      - etherpadsql
+    volumes:
+     - ./services/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
+    ports:
+    - "9101:9001"
+  nginx:
+    image: nginx:alpine
+    volumes:
+    - ./services/nginx/default.conf:/etc/nginx/conf.d/default.conf
+    ports:
+    - "5000:80"
   bot:
     image: bot
     build: .
@@ -33,3 +67,4 @@ services:
      - "5000:5000"  
 volumes:
   data:
+  ep-mysql-volume: