diff --git a/pica-etherpad/.gitignore b/pica-etherpad/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..60a6571a1a81ce92a84120f8bcdc72f29bd34028 --- /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 7f0e4c20183feacfa788f77c010f2f40e59ca111..1efa87cd6e24d54ac3797313365bb09d8e39bafb 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