From 62768e17853f3e40c9e11f4067583cd0b5f3e529 Mon Sep 17 00:00:00 2001 From: Christian Elberfeld <elberfeld@web.de> Date: Tue, 17 Oct 2017 22:31:41 +0200 Subject: [PATCH] etherpad repariert --- .../templates/docker-compose.yml | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/webserver/docker_etherpad/templates/docker-compose.yml b/webserver/docker_etherpad/templates/docker-compose.yml index 6f3a2875..f09a70b4 100644 --- a/webserver/docker_etherpad/templates/docker-compose.yml +++ b/webserver/docker_etherpad/templates/docker-compose.yml @@ -1,32 +1,32 @@ version: "3" -services: - - db: - - image: mysql:5.7 - restart: always - volumes: - - /srv/etherpad/:/var/lib/mysql - environment: - MYSQL_ROOT_PASSWORD: warpzone - - app: - - image: tvelocity/etherpad-lite:latest - restart: always - depends_on: - - db - ports: - - 127.0.0.1:42003:42003 - environment: - ETHERPAD_TITLE: warpzone Etherpad Lite - ETHERPAD_PORT: 42003 - ETHERPAD_DB_USER: root - ETHERPAD_DB_PASSWORD: warpzone - MYSQL_PORT: tcp://db:3306 - MYSQL_PORT_3306_TCP: tcp://db:3306 - MYSQL_PORT_3306_TCP_ADDR: db - MYSQL_PORT_3306_TCP_PORT: 3306 - MYSQL_PORT_3306_TCP_PORT: tcp +services: + + mysql: + + image: mysql:5.7 + restart: always + volumes: + - /srv/etherpad/:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: warpzone + + app: + + image: tvelocity/etherpad-lite:latest + restart: always + depends_on: + - mysql + ports: + - 127.0.0.1:42003:42003 + environment: + ETHERPAD_TITLE: warpzone Etherpad Lite + ETHERPAD_PORT: 42003 + ETHERPAD_DB_USER: root + ETHERPAD_DB_PASSWORD: warpzone + MYSQL_PORT: 3306 + MYSQL_PORT_3306_TCP: tcp://mysql:3306 + MYSQL_PORT_3306_TCP_ADDR: mysql + MYSQL_PORT_3306_TCP_PORT: 3306 + MYSQL_PORT_3306_TCP_PORT: tcp -- GitLab