Просмотр исходного кода

Ignored config.yaml, removed documents link and added a docker-compose file

Andrea Fazzi 6 лет назад
Родитель
Сommit
6ca34a1793
4 измененных файлов с 37 добавлено и 31 удалено
  1. 0 30
      config/config.yaml
  2. 10 0
      karmen_compose/db.env
  3. 27 0
      karmen_compose/docker-compose.yml
  4. 0 1
      templates/layout/base.html.tpl

+ 0 - 30
config/config.yaml

@@ -1,30 +0,0 @@
-domain: "foo.org"
-log_level: 2
-
-orm:
-  connection: "karmen:karmen@tcp(db:3306)/karmen_dev"
-  options: "charset=utf8&parseTime=True&loc=Local"
-  automigrate: true
-  reset: false
-  regenerate: false
-
-admin:
-  username: "admin"
-  password: "aolieVooju"
-
-ldap:
-  host: "localhost"
-  port: 389
-  bind_password: "admin"
-  bind_user: "cn=admin,dc=foo,dc=org"
-  root_dn: "dc=foo,dc=org"
-
-limesurvey:
-  url: "http://localhost:8081/index.php/admin/remotecontrol"
-  username: "admin"
-  password: "password"
-
-cloud:
-  url: "http://localhost:8082/remote.php/webdav/"
-  username: "admin"
-  password: "password"

+ 10 - 0
karmen_compose/db.env

@@ -0,0 +1,10 @@
+MYSQL_ROOT_PASSWORD=karmen
+MYSQL_PASSWORD=karmen
+MYSQL_DATABASE=karmen_dev
+MYSQL_USER=karmen
+
+
+
+
+
+

+ 27 - 0
karmen_compose/docker-compose.yml

@@ -0,0 +1,27 @@
+version: "3.3"
+
+services:
+
+  app:
+    build: ../
+    ports:
+      - 3000:3000
+    environment:
+      - DB_HOST=db
+      - DB_PORT=3306
+
+  db:
+    image: mariadb
+    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+    restart: always
+    volumes:
+      - db:/var/lib/mysql
+      - ./sql:/docker-entrypoint-initdb.d
+    env_file:
+      - db.env
+      
+volumes:
+  db:
+  
+
+      

+ 0 - 1
templates/layout/base.html.tpl

@@ -29,7 +29,6 @@
 	    <li><a href="/subjects">Materie</a></li>
 	    <li><a href="/classes">Classi</a></li>
 	    <li><a href="/activities">Attività</a></li>
-	    <li><a href="/documents">Documenti</a></li>
           </ul>
 
 	  <ul class="nav navbar-nav navbar-right">