From 94ae14ad49c091e106d0fc04f159ce44a702cf2c Mon Sep 17 00:00:00 2001
From: Alberto Larraz <alberto@isardvdi.com>
Date: Tue, 10 May 2022 18:47:13 +0200
Subject: [PATCH] requirements added and sysadm debian script updated

---
 README.md                           | 15 +++++++++++++++
 README_en.md                        | 13 +++++++++++++
 README_es.md                        | 11 +++++++++++
 isard-apps                          |  2 +-
 isard-sso                           |  2 +-
 sysadm/debian_docker_and_compose.sh |  7 +++++--
 6 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7ff0af5..2367ce3 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,21 @@ El projecte proporcionarà una solució integrada per a gestionar l'entorn comú
 * (algunes aplicacions com BigBlueButton i el email es poden integrar en el mateix servidor o servidors externs...)
 
   
+
+## Requisits
+
+Distribució de linux, **docker-ce**, and **docker-compose > 1.28**
+
+```
+docker-compose --version
+# if version < 1.28: 
+pip3 install --upgrade docker-compose
+docker-compose --version
+```
+
+Si fas servir una distribució **debian**, per fer la instal·lació de les dependencies, docker i docker-compose pots seguir: [sysadm/debian_docker_and_compose.sh](sysadm/debian_docker_and_compose.sh)
+
+
 ## Inici ràpid
 
 ```
diff --git a/README_en.md b/README_en.md
index 23767da..ce09a1e 100644
--- a/README_en.md
+++ b/README_en.md
@@ -52,6 +52,19 @@ To easily migrate and insert users and groups to the system there are also two p
 
 This admin interface is now in an alpha status but allows to manage users in sync between Keycloak, Moodle and Nextcloud.
 
+## Requirements
+
+Linux distro, **docker-ce**, and **docker-compose > 1.28**
+
+```
+docker-compose --version
+# if version < 1.28: 
+pip3 install --upgrade docker-compose
+docker-compose --version
+```
+
+If you have **debian**, docker and dependencies installation in [sysadm/debian_docker_and_compose.sh](sysadm/debian_docker_and_compose.sh)
+
 
 ## Quick start
 
diff --git a/README_es.md b/README_es.md
index addb26f..f555ac3 100644
--- a/README_es.md
+++ b/README_es.md
@@ -51,7 +51,18 @@ Para migrar e introducir fácilmente usuarios y grupos al sistema también hay d
 
 Esta interfaz de administración está en estado alfa, pero ya permite gestionar usuarios sincronizados entre Keycloak, Moodle y Nextcloud.
 
+## Requerimientos
 
+Distribución de linux, **docker-ce**, and **docker-compose > 1.28**
+
+```
+docker-compose --version
+# if version < 1.28: 
+pip3 install --upgrade docker-compose
+docker-compose --version
+```
+
+Si utilizas una distribución **debian**, para instalar las dependencias, docker y docker-compose puedes seguir: [sysadm/debian_docker_and_compose.sh](sysadm/debian_docker_and_compose.sh)
 
 ## Inicio rápido
 
diff --git a/isard-apps b/isard-apps
index 2419813..c0f7ee1 160000
--- a/isard-apps
+++ b/isard-apps
@@ -1 +1 @@
-Subproject commit 24198139c5f8fb40925312b672a531e464d64126
+Subproject commit c0f7ee13b2c0daae32a4e05eb8411192038df0c0
diff --git a/isard-sso b/isard-sso
index 9fc08ee..3391e00 160000
--- a/isard-sso
+++ b/isard-sso
@@ -1 +1 @@
-Subproject commit 9fc08ee6a3bbf27f27bc66689f0c2af4789bc2cc
+Subproject commit 3391e00cc32b03e6d12268f53c0bec2f4e2c74f5
diff --git a/sysadm/debian_docker_and_compose.sh b/sysadm/debian_docker_and_compose.sh
index b00f4b8..341ee4b 100755
--- a/sysadm/debian_docker_and_compose.sh
+++ b/sysadm/debian_docker_and_compose.sh
@@ -4,11 +4,13 @@ apt-get install -y \
     ca-certificates \
     curl \
     gnupg-agent \
-    software-properties-common
+    software-properties-common \
+    git \
+    unzip 
 curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
 add-apt-repository \
    "deb [arch=amd64] https://download.docker.com/linux/debian \
-   buster \
+    $(lsb_release -cs) \
    stable"
 apt-get update -y
 apt-get install -y docker-ce docker-ce-cli containerd.io   
@@ -16,3 +18,4 @@ apt-get install -y docker-ce docker-ce-cli containerd.io
 apt install python3-pip -y
 pip3 install docker-compose
 
+apt install dictionaries-common wamerican -y