From e97ea68cdc535cb065bd2c8326890851a936384d Mon Sep 17 00:00:00 2001 From: Dimitris Giouroukis Date: Mon, 12 Sep 2016 14:47:06 +0300 Subject: [PATCH 1/2] Update compose file to v2 --- docker-compose.yml | 100 ++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3279fc4..e681e49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,50 +1,50 @@ -nginx: - build: ./nginx/ - ports: - - 80:80 - links: - - php - volumes_from: - - app - -php: - build: ./php/ - expose: - - 9000 - links: - - mysql - volumes_from: - - app - -app: - image: php:5.6-fpm - volumes: - - path/to/your/application:/var/www/application - command: "true" - - -mysql: - build: ./mysql/ - volumes_from: - - data - environment: - MYSQL_ROOT_PASSWORD: rootpassword - MYSQL_DATABASE: dbname - MYSQL_USER: username - MYSQL_PASSWORD: password - -data: - image: mysql:5.6 - volumes: - - ./mysql/data/mysql:/var/lib/mysql - - ./mysql/data/dump.sql:/docker-entrypoint-initdb.d/dump.sql - command: "true" - -phpmyadmin: - image: phpmyadmin/phpmyadmin - ports: - - 8080:80 - links: - - mysql - environment: - PMA_HOST: mysql +version: '2' +services: + nginx: + build: ./nginx/ + container_name: nginx + ports: + - "80:80" + links: + - php + volumes_from: + - app + php: + build: ./php/ + container_name: php + expose: + - 9000 + links: + - mysql + volumes_from: + - app + app: + image: php:5.6-fpm + container_name: app + volumes: + - path/to/app:/var/www/application + command: "true" + mysql: + build: ./mysql/ + container_name: mysql + volumes_from: + - data + environment: + - MYSQL_ROOT_PASSWORD="rootpassword" + - MYSQL_DATABASE="dbname" + - MYSQL_USER="username" + - MYSQL_PASSWORD="password" + data: + image: mysql:5.6 + volumes: + - ./mysql/data/mysql:/var/lib/mysql + - ./mysql/data/dump.sql:/docker-entrypoint-initdb.d/dump.sql + command: "true" + phpmyadmin: + image: phpmyadmin/phpmyadmin + ports: + - "8080:80" + links: + - mysql + environment: + - PMA_HOST="mysql" From 1f387a88a9ae57c118b44427a880190536dbf46b Mon Sep 17 00:00:00 2001 From: Dimitris Giouroukis Date: Mon, 12 Sep 2016 15:11:18 +0300 Subject: [PATCH 2/2] Remove erroneous tab characters --- docker-compose.yml | 72 +++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e681e49..f40ee77 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,49 +2,49 @@ version: '2' services: nginx: build: ./nginx/ - container_name: nginx - ports: - - "80:80" - links: - - php - volumes_from: - - app + container_name: nginx + ports: + - "80:80" + links: + - php + volumes_from: + - app php: build: ./php/ - container_name: php - expose: - - 9000 - links: - - mysql - volumes_from: - - app + container_name: php + expose: + - 9000 + links: + - mysql + volumes_from: + - app app: image: php:5.6-fpm - container_name: app - volumes: - - path/to/app:/var/www/application - command: "true" + container_name: app + volumes: + - path/to/app:/var/www/application + command: "true" mysql: build: ./mysql/ - container_name: mysql - volumes_from: - - data - environment: - - MYSQL_ROOT_PASSWORD="rootpassword" - - MYSQL_DATABASE="dbname" - - MYSQL_USER="username" - - MYSQL_PASSWORD="password" + container_name: mysql + volumes_from: + - data + environment: + - MYSQL_ROOT_PASSWORD="rootpassword" + - MYSQL_DATABASE="dbname" + - MYSQL_USER="username" + - MYSQL_PASSWORD="password" data: image: mysql:5.6 - volumes: - - ./mysql/data/mysql:/var/lib/mysql - - ./mysql/data/dump.sql:/docker-entrypoint-initdb.d/dump.sql - command: "true" + volumes: + - ./mysql/data/mysql:/var/lib/mysql + - ./mysql/data/dump.sql:/docker-entrypoint-initdb.d/dump.sql + command: "true" phpmyadmin: image: phpmyadmin/phpmyadmin - ports: - - "8080:80" - links: - - mysql - environment: - - PMA_HOST="mysql" + ports: + - "8080:80" + links: + - mysql + environment: + - PMA_HOST="mysql"