docker

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