Rebase first step

.gitmodules

@@ -1,5 +1,5 @@
 [submodule "docker/static/goStatic"]
-	path = docker/static/goStatic
+	path = app_build/static/goStatic
 	url = https://github.com/PierreZ/goStatic
 [submodule "docker/blog/quentin.dufour.io"]
 	path = docker/blog-quentin/quentin.dufour.io

README.md

@@ -10,7 +10,7 @@ We try to build a generic abstraction stack between our different resources (CPU
   * ansible (physical node conf)
   * nomad (schedule containers)
   * consul (distributed key value store / lock / service discovery)
-  * glusterfs (file storage)
+  * garage/glusterfs (file storage)
   * stolon + postgresql (distributed relational database)
   * docker (container tool)
   * bottin (LDAP server, auth)
@@ -23,6 +23,19 @@ Some services we provide:
 
 As a generic abstraction is provided, deploying new services should be easy.
 
+## I am lost, how this repo works?
+
+To ease the development, we make the choice of a fully integrated environment
+
+  1. `os_build`: where you will build our OS image based on Debian that you will install on your server
+  2. `os_config`: our Ansible recipes to configure and update your freshly installed server
+  3. `app_build`: our Docker files to build immutable images of our applications
+  4. `app_integration`: Our Docker compose files to test locally how our built images interact together
+  5. `app_config`: Files containing application configurations to be deployed on Consul Key Value Store
+  6. `app_deployment`: Files containing application definitions to be deployed on Nomad Scheduler
+  7. `op_guide`: Guides to explain you operations you can do cluster wide (like configuring postgres)
+
+
 ## Start hacking
 
 ### Clone the repository

app_build/docker-compose.yml

@@ -0,0 +1,60 @@
+version: '3.4'
+services:
+
+  # Instant Messaging
+  riot:
+    build:
+      context: ./riotweb
+      args:
+        # https://github.com/vector-im/riot-web/releases
+        VERSION: 1.7.5
+    image: superboum/amd64_riotweb:v15
+
+  synapse:
+    build: 
+      context: ./matrix-synapse
+      args:
+        # https://github.com/matrix-org/synapse/releases
+        VERSION: 1.19.1
+    image: superboum/amd64_synapse:v33
+
+  # Email
+  sogo:
+    build:
+      context: ./sogo
+      args:
+        # fake for now
+        VERSION: 5.0.0
+    image: superboum/amd64_sogo:v7
+
+  # VoIP
+  jitsi-meet:
+    build:
+      context: ./jitsi-meet
+      args:
+        # https://github.com/jitsi/jitsi-meet
+        VERSION: 4966
+    image: superboum/amd64_jitsi_meet:v1
+
+  jitsi-confererence-focus:
+    build:
+      context: ./jitsi-conference-focus
+      args:
+        # https://github.com/jitsi/jicofo
+        VERSION: 4966
+    image: superboum/amd64_jitsi_conference_focus:v3
+
+  jitsi-videobridge:
+    build:
+      context: ./jitsi-videobridge
+      args:
+        # https://github.com/jitsi/jitsi-videobridge
+        VERSION: 4966
+    image: superboum/amd64_jitsi_videobridge:v10
+
+  jitsi-xmpp:
+    build:
+      context: ./jitsi-xmpp
+      args:
+        VERSION: fake-1
+    image: superboum/amd64_jitsi_xmpp:v2

app_build/jitsi-conference-focus/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:buster AS builder
 
-ENV VERSION=4510
+#ENV VERSION=4510
 RUN apt-get update && \
     apt-get install -y openjdk-11-jdk maven wget unzip && \
     wget https://github.com/jitsi/jicofo/archive/jitsi-meet_${VERSION}.zip -O jicofo.zip && \

app_build/jitsi-meet/Dockerfile

@@ -1,6 +1,6 @@
 FROM debian:buster AS builder
 
-ENV VERSION=4048
+#ENV VERSION=4048
 RUN apt-get update && \
     apt-get install -y npm git nodejs make wget unzip && \
     wget https://github.com/jitsi/jitsi-meet/archive/${VERSION}.zip -O jitsi-meet.zip && \

app_build/jitsi-videobridge/Dockerfile

@@ -3,7 +3,7 @@ FROM debian:buster AS builder
 RUN apt-get update && \
     apt-get install -y wget unzip maven openjdk-11-jdk 
 
-ENV VERSION=4468
+#ENV VERSION=4468
 RUN wget https://github.com/jitsi/jitsi-videobridge/archive/stable/jitsi-meet_${VERSION}.zip -O jvb.zip && \
     unzip jvb.zip && \
     mv jitsi-videobridge-stable-jitsi-meet_${VERSION} jvb && \