summaryrefslogtreecommitdiffstats
path: root/Applications/phpmyadmin/docker-compose.yml
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2015-12-07 01:42:57 +0100
committerstartxfr <clarue@startx.fr>2015-12-07 01:42:57 +0100
commit15d8c51d28fa2245886b732df5373eedb2dde0cf (patch)
treefee07e202e87e4274aa7cea7070fc9dad368de62 /Applications/phpmyadmin/docker-compose.yml
parent7f9465928d5b149e4fb5f9bc476b8cb7298436fc (diff)
downloadphpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.tar.gz
phpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.tar.bz2
phpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.tar.xz
phpmyadmin-15d8c51d28fa2245886b732df5373eedb2dde0cf.zip
update container naming and fix phpmyadmin.
Diffstat (limited to 'Applications/phpmyadmin/docker-compose.yml')
-rw-r--r--Applications/phpmyadmin/docker-compose.yml19
1 files changed, 17 insertions, 2 deletions
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