From 27da59f0c03a05ec0ebda23fdcfd21e5b6a8a59c Mon Sep 17 00:00:00 2001
From: www <bofh@fet.at>
Date: Fri, 15 Jan 2021 20:09:15 +0000
Subject: [PATCH] docker

---
 .dockerignore           |  2 +-
 Dockerfile.nginx        |  2 ++
 Dockerfile.theia        |  2 ++
 build_dev_docker_images |  6 ++++++
 docker-compose.dev.yml  | 40 +++++++---------------------------------
 5 files changed, 18 insertions(+), 34 deletions(-)
 create mode 100644 Dockerfile.nginx

diff --git a/.dockerignore b/.dockerignore
index de3c62b..2977557 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,2 @@
 _archiv/*
-.env/*
\ No newline at end of file
+.env/*
diff --git a/Dockerfile.nginx b/Dockerfile.nginx
new file mode 100644
index 0000000..a99c898
--- /dev/null
+++ b/Dockerfile.nginx
@@ -0,0 +1,2 @@
+from nginx:alpine
+copy ./services/nginx/default.conf /etc/nginx/conf.d/default.conf
diff --git a/Dockerfile.theia b/Dockerfile.theia
index eb060e6..c4f6f36 100644
--- a/Dockerfile.theia
+++ b/Dockerfile.theia
@@ -1,5 +1,7 @@
 from theiaide/theia-python:latest
+RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-20.10.2.tgz && tar -xvf docker-20.10.2.tgz docker/docker && cp docker/docker /usr/bin/
 run apt-get update && apt-get -y install libgs-dev
+WORKDIR /home/project
 COPY ./requirements.txt .
 run pip3 install --upgrade pip && pip3 install -r requirements.txt && pip3 install pytest pylint bandit flake8 black pytest-django six pytest-mock
 COPY . .
diff --git a/build_dev_docker_images b/build_dev_docker_images
index 2bbeb9a..e8b1dfc 100755
--- a/build_dev_docker_images
+++ b/build_dev_docker_images
@@ -9,4 +9,10 @@ docker push $REGISTRY/andisdev
 echo "Building SOLR Server Image Solrfet"
 cd services/solr_server
 docker build -t $REGISTRY/solrfet:latest .
+docker push $REGISTRY/solrfet
+cd ../..
+
+docker build -f Dockerfile.nginx -t $REGISTRY/andisdevnginx:latest .
+docker push $REGISTRY/andisdevnginx:latest
+
 
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 85f9f1f..75db332 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,21 +1,7 @@
-version: '3'
+version: '2'
 services:
   solr:
-    image: my_fet_solr
-    build: ./services/solr_server
-    ports:
-     - "8980:8983"
-    volumes:
-      - data:/var/solr
-    command:
-      - solr-precreate 
-      - core 
-      - /opt/solr/server/solr/configsets/fetconfig
-  solrprotocol:
-    image: my_fet_solr
-    build: ./services/solr_server
-    ports:
-     - "8980:8983"
+    image: docker.triton2.fet.at/solrfet
     volumes:
       - data:/var/solr
     command:
@@ -23,9 +9,8 @@ services:
       - core 
       - /opt/solr/server/solr/configsets/fetconfig
   etherpadsql:
-    image: jbergstroem/mariadb-alpine
+    image: mariadb
     environment:
-      SKIP_INNODB: "no"
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
       MYSQL_PASSWORD: hgu
@@ -48,28 +33,17 @@ services:
     depends_on:
       - etherpadsql
     volumes:
-     - ./services/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
-    ports:
-    - "9101:9001"
+     - /srv/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt
   nginx:
     image: nginx:alpine
     volumes:
     - ./services/nginx/default.conf:/etc/nginx/conf.d/default.conf
     ports:
     - "5000:80"
-#  bot:
-#    image: bot
-#    build: .
-#    environment:
-#     TARGET: https://andis.2020.fet.at
-#     SOLR_HOST: http://solr:8983
-#    ports:
-#      - "5000:5000"
   theia:
-    image: theiaide/theia-python:latest
-    volumes:
-      - .:/home/project
-      - ../packages:/home/packages
+    image: docker.triton2.fet.at/andisdev
 volumes:
   data:
+    driver: local
   ep-mysql-volume:
+    driver: local