From 937e1743675c0750a05f9a7762b19519994391c1 Mon Sep 17 00:00:00 2001
From: Guillaume Lung Tung <guillaume@laraffinerie.re>
Date: Tue, 29 Jun 2021 13:10:31 +0400
Subject: [PATCH] first commit

---
 docker-compose.yml | 51 +++++++++++++++++++++++++++++++++++++---------
 env/passbolt.env   |  2 +-
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 661189c..bae4536 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,9 +5,17 @@ services:
     env_file:
       - env/mysql.env
     volumes:
-      - database_volume:/var/lib/mysql
+      - ./data/database_volume:/var/lib/mysql
     ports:
       - "127.0.0.1:3306:3306"
+    networks:
+      - backend 
+    restart: always
+    deploy:
+      resources:
+          limits:
+            cpus: "1"
+            memory: 150M 
 
   passbolt:
     image: passbolt/passbolt:latest-ce
@@ -19,17 +27,40 @@ services:
     env_file:
       - env/passbolt.env
     volumes:
-      - gpg_volume:/etc/passbolt/gpg
-      - images_volume:/usr/share/php/passbolt/webroot/img/public
+      - ./data/gpg_volume:/etc/passbolt/gpg
+      - ./data/images_volume:/usr/share/php/passbolt/webroot/img/public
     command: ["/usr/bin/wait-for.sh", "-t", "0", "db:3306", "--", "/docker-entrypoint.sh"]
-    ports:
-      - 80:80
-      - 443:443
+    #ports:
+    #  - 80:80#
+    #  - 443:443#
     #Alternatively for non-root images:
     # - 80:8080
     # - 443:4433
+    labels:
+      traefik.enable: "true"
+      traefik.docker.network: "frontend"
 
-volumes:
-  database_volume:
-  gpg_volume:
-  images_volume:
+      traefik.http.routers.passbolt-http.rule: "Host(`${DOMAIN}`)"
+      traefik.http.routers.passbolt-http.entrypoints: "entrypoints-http"
+      traefik.http.routers.passbolt-http.middlewares: "redirect"
+      traefik.http.middlewares.redirect.redirectscheme.scheme: "https"
+
+      traefik.http.routers.passbolt-https.rule: "Host(`${DOMAIN}`)"
+      traefik.http.routers.passbolt-https.entrypoints: "entrypoints-https"
+      traefik.http.routers.passbolt-https.tls.certresolver: "myresolver"
+    networks:
+      - frontend
+      - backend
+    restart: always
+    deploy:
+      resources:
+          limits:
+            cpus: "1"
+            memory: 200M   
+
+
+
+networks:
+  frontend:
+    external: true
+  backend:
\ No newline at end of file
diff --git a/env/passbolt.env b/env/passbolt.env
index 21be0fc..4f28d86 100644
--- a/env/passbolt.env
+++ b/env/passbolt.env
@@ -1,5 +1,5 @@
 # URL
-APP_FULL_BASE_URL=https://passbolt.local
+APP_FULL_BASE_URL=https://passbolt.guillaume.laraffinerie.re
 
 # Database settings
 DATASOURCES_DEFAULT_HOST=db