From 15d8c51d28fa2245886b732df5373eedb2dde0cf Mon Sep 17 00:00:00 2001 From: startxfr Date: Mon, 7 Dec 2015 01:42:57 +0100 Subject: update container naming and fix phpmyadmin. --- Applications/phpmyadmin/docker-compose.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Applications/phpmyadmin/docker-compose.yml') diff --git a/Applications/phpmyadmin/docker-compose.yml b/Applications/phpmyadmin/docker-compose.yml index 9a8d4d9..7f2f747 100644 --- a/Applications/phpmyadmin/docker-compose.yml +++ b/Applications/phpmyadmin/docker-compose.yml @@ -8,12 +8,27 @@ server: ports: - "9215:80" - "9216:443" + links: + - demo_db:db environment: CONTAINER_TYPE: "application" CONTAINER_SERVICE: "phpmyadmin" CONTAINER_INSTANCE: "application-phpmyadmin" SERVER_NAME: "localhost" - DOC_ROOT: "/data/apache" volumes: - "/tmp/container/logs/phpmyadmin:/data/logs/apache_php" - - "/tmp/container/phpmyadmin:/data/apache_php" \ No newline at end of file + - "/tmp/container/phpmyadmin:/data/apache_php" + +demo_db: + image: startx/sv-mariadb + container_name: "service-mariadb" + expose: + - "3306" + environment: + CONTAINER_TYPE: "service" + CONTAINER_SERVICE: "mariadb" + CONTAINER_INSTANCE: "service-mariadb" + MYSQL_ROOT_PASSWORD: "secretdemerde" + MYSQL_USER: "user-test" + MYSQL_PASSWORD: "pwd-test" + MYSQL_DATABASE: "db_test" \ No newline at end of file -- cgit v1.2.3