From 0b27c79a4ff8c1e014c013328d96843f705ca6dc Mon Sep 17 00:00:00 2001
From: Igor WITZ <igor.witz@etu.utc.fr>
Date: Thu, 18 Oct 2018 17:00:05 +0200
Subject: [PATCH] limites de ressources
---
pica-etherpad/.gitignore | 2 ++
pica-etherpad/docker-compose.yml | 53 ++++++++++++++++++--------------
2 files changed, 32 insertions(+), 23 deletions(-)
create mode 100644 pica-etherpad/.gitignore
diff --git a/pica-etherpad/.gitignore b/pica-etherpad/.gitignore
new file mode 100644
index 00000000..60a6571a
--- /dev/null
+++ b/pica-etherpad/.gitignore
@@ -0,0 +1,2 @@
+etherpad-app.secrets
+etherpad-db.secrets
diff --git a/pica-etherpad/docker-compose.yml b/pica-etherpad/docker-compose.yml
index 7f0e4c20..1efa87cd 100755
--- a/pica-etherpad/docker-compose.yml
+++ b/pica-etherpad/docker-compose.yml
@@ -1,25 +1,32 @@
-etherpad-app:
- image: pica-etherpad:1.7.0
- container_name: etherpad-app
- links:
- - etherpad-db:mysql
- security_opt:
- - no-new-privileges
- env_file: ./etherpad-app.secrets
- ports: ['8080:8080']
- labels:
- - "traefik.frontend.rule=Host:pad.test.picasoft.net"
- - "traefik.port=8080"
- - "traefik.enable=true"
- restart: always
+version : "2.4"
+services:
+ etherpad-app:
+ image: pica-etherpad:1.7.0
+ container_name: etherpad-app
+ links:
+ - etherpad-db:mysql
+ security_opt:
+ - no-new-privileges
+ mem_limit: "2048m"
+ cpus: "0.60"
+ pids_limit: 1024
+ env_file: ./etherpad-app.secrets
+ ports: ['8080:8080']
+ labels:
+ - "traefik.frontend.rule=Host:pad.test.picasoft.net"
+ - "traefik.port=8080"
+ - "traefik.enable=true"
+ restart: always
-etherpad-db:
- image: mysql:5.7
- container_name: etherpad-db
- security_opt:
- - no-new-privileges
- volumes:
- - /DATA/docker/etherpad/etherpad-db/data:/var/lib/mysql
- env_file: ./etherpad-db.secrets
- restart: always
+ etherpad-db:
+ image: mysql:5.7
+ container_name: etherpad-db
+ security_opt:
+ - no-new-privileges
+ mem_limit: 2048m
+ cpus: "0.20"
+ volumes:
+ - /DATA/docker/etherpad/etherpad-db/data:/var/lib/mysql
+ env_file: ./etherpad-db.secrets
+ restart: always
--
GitLab