Merge pull request #26 from francescou/compose-1.7

Compose 1.7

README.md

@@ -25,7 +25,7 @@ Run the following command in terminal:
     --name docker-compose-ui \
     -p 5000:5000 \
     -v /var/run/docker.sock:/var/run/docker.sock \
-    francescou/docker-compose-ui:0.15
+    francescou/docker-compose-ui:0.16
 
 or, if you already have docker-compose installed, just `docker-compose up`.
 
@@ -46,7 +46,7 @@ If you want to use your own docker-compose projects, put them into a directory *
         -p 5000:5000 \
         -v /home/user/docker-compose-ui/demo-projects:/opt/docker-compose-projects:ro \
         -v /var/run/docker.sock:/var/run/docker.sock \
-        francescou/docker-compose-ui:0.15
+        francescou/docker-compose-ui:0.16
 
 you can download my example projects into */home/user/docker-compose-ui/demo-projects/* from https://github.com/francescou/docker-compose-ui/tree/master/demo-projects
 
@@ -70,7 +70,7 @@ You can also run containers on a remote docker host, e.g.
         -p 5000:5000 \
         -v /home/user/docker-compose-ui/demo-projects:/opt/docker-compose-projects:ro \
         -e DOCKER_HOST=remote-docker-host:2375 \
-        francescou/docker-compose-ui:0.15
+        francescou/docker-compose-ui:0.16
 
 
 ### Docker Swarm or HTTPS Remote docker host
@@ -89,7 +89,7 @@ For example:
         --name docker-compose-ui \
         -p 5000:5000 \
         -v /home/user/.docker/config.json:/root/.docker/config.json:ro \
-        francescou/docker-compose-ui:0.15
+        francescou/docker-compose-ui:0.16
 
 ## Technologies
 

docker-compose.yml

@@ -1,6 +1,6 @@
 docker_compose_ui:
     restart: always
-    image: francescou/docker-compose-ui:0.15
+    image: francescou/docker-compose-ui:0.16
     container_name: docker_compose_ui
     hostname: docker_compose_ui
     ports:

requirements.txt

@@ -1,2 +1,2 @@
 Flask==0.10.1
-docker-compose==1.6.2
+docker-compose==1.7

scripts/bridge.py

@@ -6,13 +6,14 @@
 from compose.container import Container
 from compose.cli.command import get_project as compose_get_project, get_config_path_from_options
 from compose.config.config import get_default_config_files
+from compose.config.environment import Environment
 
 def ps_(project):
     """
     containers status
     """
     logging.debug('ps ' + project.name)
-    containers = project.containers(stopped=True) + project.containers(one_off=True)
+    containers = project.containers(stopped=True)
 
     items = [{
         'name': container.name,
@@ -51,6 +52,7 @@ def get_project(path):
     get docker project given file path
     """
     logging.debug('get project ' + path)
-    config_path = get_config_path_from_options(dict([('--file', path)]))
-    project = compose_get_project(config_path)
+    environment = Environment.from_env_file(path)
+    config_path = get_config_path_from_options(path, dict(), environment)
+    project = compose_get_project(path, config_path)
     return project

static/index.html

@@ -51,7 +51,7 @@ <h3>Projects</h3>
         <footer class="text-center">
             <small class="text-muted"><a
                 href="https://github.com/francescou/docker-compose-ui">Docker
-                Compose UI v.0.15</a>  Licensed under the MIT license.</small>
+                Compose UI v.0.16</a>  Licensed under the MIT license.</small>
         </footer>
     </div>