From 9598cc36bb88e9cc47cbe38ff05522dbab3730c5 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvial@goacegroup.com>
Date: Thu, 16 Jun 2022 13:25:45 -0400
Subject: [PATCH] Modules and docker

---
 .gitmodules        |  6 +++++
 api                |  1 +
 docker-compose.yml | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 errors.ini         |  2 ++
 ui                 |  1 +
 5 files changed, 68 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 api
 create mode 100644 docker-compose.yml
 create mode 100644 errors.ini
 create mode 160000 ui

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a7fb8f6
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "api"]
+	path = api
+	url = http://git.provm.cl/Incoviba/api
+[submodule "ui"]
+	path = ui
+	url = http://git.provm.cl/Incoviba/ui
diff --git a/api b/api
new file mode 160000
index 0000000..42a97bb
--- /dev/null
+++ b/api
@@ -0,0 +1 @@
+Subproject commit 42a97bb0743b09a4a021aa01021898009dc16b94
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..dc36534
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,58 @@
+version: '3'
+
+services:
+  proxy:
+    container_name: incoviba_web
+    image: nginx
+    restart: unless-stopped
+    #env_file:
+    #  - .proxy.env
+    volumes:
+      - ./ui/nginx.conf:/etc/nginx/conf.d/default.conf
+      - ./api/nginx.conf:/etc/nginx/conf.d/api.conf
+      - ./ui:/app/ui
+      - ./api:/app/api
+      - ./logs/proxy:/var/log/nginx
+    ports:
+      - "8080:80"
+      - "8081:81"
+  ui:
+    container_name: incoviba_ui
+    build:
+      context: ./ui
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    env_file:
+      - .api.key
+      - ./ui/.env
+    volumes:
+      - ./ui:/app/ui
+      - ./errors.ini:/usr/local/etc/php/conf.d/docker-errors.ini
+      - ./logs/ui:/var/log/php
+  api:
+    container_name: incoviba_api
+    build:
+      context: ./api
+      dockerfile: Dockerfile
+    restart: unless-stopped
+    env_file:
+      - .api.key
+      - ./api/.env
+      - ./api/.db.env
+    volumes:
+      - ./api:/app/api
+      - ./errors.ini:/usr/local/etc/php/conf.d/docker-errors.ini
+      - ./logs/api:/var/log/php
+  db:
+    container_name: incoviba_db
+    image: mariadb
+    restart: unless-stopped
+    env_file:
+      - ./api/.db.env
+    volumes:
+      - incoviba_db:/var/lib/mysql
+    ports:
+      - "3308:3306"
+
+volumes:
+  incoviba_db: {}
diff --git a/errors.ini b/errors.ini
new file mode 100644
index 0000000..f32a8ec
--- /dev/null
+++ b/errors.ini
@@ -0,0 +1,2 @@
+log_errors = On
+error_log = /var/log/php/error.log
diff --git a/ui b/ui
new file mode 160000
index 0000000..119cdd2
--- /dev/null
+++ b/ui
@@ -0,0 +1 @@
+Subproject commit 119cdd2b9517cb457e307ff593939e120b0c0c65