Merge branch 'master' into proxy

2017-03-31 16:42:30 +07:00
parent fc460f9497 170a1efeb1
commit b58f859eff
7 changed files with 47 additions and 3 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -390,6 +390,17 @@ services:
      networks:
        - frontend

+### Adminer Container ####################################
+
+    adminer:
+      build: ./adminer
+      ports:
+        - "${ADM_PORT}:8080"
+      depends_on:
+        - php-fpm
+      networks:
+        - frontend 
+
 ### pgAdmin Container #######################################

    pgadmin:
@ -534,6 +545,8 @@ volumes:
    driver: "local"
  phpmyadmin:
    driver: "local"
+  adminer:
+    driver: "local"
  aerospike:
    driver: "local"
  caddy: