Commit d6bf3543 authored by Quentin Duchemin's avatar Quentin Duchemin
Browse files

Merge branch 'traefik-v2' into 'master'

Migrate to Traefik v2

See merge request picasoft/projets/dockerfiles!53
parents 28ab1471 430e684d
version : "2.4"
version : "3.7"
volumes:
etherpad-db:
......@@ -12,33 +12,26 @@ volumes:
networks:
standard:
name: "etherpad_main"
name: etherpad_main
week:
name: "etherpad_week"
docker_default:
name: etherpad_week
proxy:
external: true
name: "docker_default"
services:
etherpad-app:
image: registry.picasoft.net/pica-etherpad:1.8.4
build: .
container_name: etherpad-app
depends_on:
- etherpad-db
security_opt:
- no-new-privileges
mem_limit: "2048m"
cpus: 0.6
pids_limit: 1024
env_file: ./secrets/etherpad-app.secrets
volumes:
- ./settings.json:/opt/etherpad-lite/settings.json
- deleted-pads-standard:/opt/etherpad-lite/deleted_pads
labels:
traefik.http.routers.etherpad-app.entrypoints: websecure
traefik.http.routers.etherpad-app.rule: Host(`pad.picasoft.net`)
traefik.http.services.etherpad-app.loadbalancer.server.port: 8080
traefik.enable: true
traefik.frontend.rule: "Host:pad.picasoft.net"
traefik.port: 8080
environment:
DB_HOST: "etherpad-db"
LOGLEVEL: "INFO"
......@@ -47,45 +40,36 @@ services:
THEME: "colibris"
TITLE: "Picapad"
TRUST_PROXY: "true"
restart: unless-stopped
networks:
- docker_default
- proxy
- standard
depends_on:
- etherpad-db
restart: unless-stopped
etherpad-db:
image: postgres:12
container_name: etherpad-db
security_opt:
- no-new-privileges
mem_limit: "2048m"
cpus: "0.40"
pids_limit: 1024
volumes:
- etherpad-db:/var/lib/postgresql/data
env_file: ./secrets/etherpad-db.secrets
restart: unless-stopped
networks:
- standard
restart: unless-stopped
etherpad-week-app:
image: registry.picasoft.net/pica-etherpad:1.8.4
container_name: etherpad-week-app
build: .
depends_on:
- etherpad-week-db
security_opt:
- no-new-privileges
mem_limit: "2048m"
cpus: 0.6
pids_limit: 1024
env_file: ./secrets/etherpad-week-app.secrets
volumes:
- ./settings_week.json:/opt/etherpad-lite/settings.json
- deleted-pads-week:/opt/etherpad-lite/deleted_pads
labels:
traefik.http.routers.etherpad-week-app.entrypoints: websecure
traefik.http.routers.etherpad-week-app.rule: Host(`week.pad.picasoft.net`)
traefik.http.services.etherpad-week-app.loadbalancer.server.port: 8080
traefik.enable: true
traefik.frontend.rule: "Host:week.pad.picasoft.net"
traefik.port: 8080
environment:
DB_HOST: "etherpad-week-db"
LOGLEVEL: "INFO"
......@@ -94,19 +78,16 @@ services:
THEME: "colibris"
TITLE: "Picapad Hebdo"
TRUST_PROXY: "true"
restart: unless-stopped
depends_on:
- etherpad-week-db
networks:
- docker_default
- proxy
- week
restart: unless-stopped
etherpad-week-db:
image: postgres:12
container_name: etherpad-week-db
security_opt:
- no-new-privileges
mem_limit: "2048m"
cpus: "0.40"
pids_limit: 1024
volumes:
- weekpad-db:/var/lib/postgresql/data
env_file: ./secrets/etherpad-week-db.secrets
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment