diff --git a/README.md b/README.md index 7b7fa07..dec7c8e 100644 --- a/README.md +++ b/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 diff --git a/docker-compose.yml b/docker-compose.yml index 2f101eb..aeafe5e 100644 --- a/docker-compose.yml +++ b/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: diff --git a/requirements.txt b/requirements.txt index d953b3f..3178624 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ Flask==0.10.1 -docker-compose==1.6.2 +docker-compose==1.7 diff --git a/scripts/bridge.py b/scripts/bridge.py index c93f793..d3d2f7f 100644 --- a/scripts/bridge.py +++ b/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 diff --git a/static/index.html b/static/index.html index e452ad7..e3f0667 100644 --- a/static/index.html +++ b/static/index.html @@ -51,7 +51,7 @@

Projects