From 1b206f223ff9de21479570d439ab3c0d56e610b3 Mon Sep 17 00:00:00 2001 From: Kevan Ahlquist Date: Fri, 29 Apr 2016 21:57:27 -0500 Subject: [PATCH] DockerUI => UI For Docker --- Dockerfile | 2 +- LICENSE | 2 +- README.md | 39 +++++++++++-------------- app/app.js | 4 +-- app/components/dashboard/dashboard.html | 2 +- app/components/footer/statusbar.html | 2 +- app/components/masthead/masthead.html | 2 +- bower.json | 7 +++-- dockerui.go | 4 +-- examples/swarm/README.md | 2 +- examples/swarm/docker-compose.yml | 2 +- gruntFile.js | 24 +++++++-------- index.html | 2 +- package.json | 10 +++---- 14 files changed, 50 insertions(+), 54 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2fb19279555d0..696bb0539882e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,4 @@ FROM scratch COPY dist / EXPOSE 9000 -ENTRYPOINT ["/dockerui"] +ENTRYPOINT ["/ui-for-docker"] diff --git a/LICENSE b/LICENSE index b46089a9d56c3..44a15a63149a0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -DockerUI: Copyright (c) 2013-2014 Michael Crosby. crosbymichael.com +UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 0daca42780210..790766a1bfb46 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -## DockerUI +## UI For Docker ![Containers](/containers.png) -DockerUI is a web interface for the Docker Remote API. The goal is to provide a pure client side implementation so it is effortless to connect and manage docker. This project is not complete and is still under heavy development. +UI For Docker is a web interface for the Docker Remote API. The goal is to provide a pure client side implementation so it is effortless to connect and manage docker. ![Container](/container.png) @@ -11,35 +11,30 @@ DockerUI is a web interface for the Docker Remote API. The goal is to provide a * Consistency - The web UI should be consistent with the commands found on the docker CLI. ### Quickstart -``` -git clone https://github.com/kevana/ui-for-docker.git -cd ui-for-docker -npm install -npm install -g grunt-cli -# Make sure your Docker daemon is running -grunt run # Takes a while, will build the image locally as dockerui:latest and run it -# Open your browser to `http://:9000` -``` +1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock uifd/ui-for-docker` +2. Open your browser to `http://:9000` -Bind mounting the Unix socket into the DockerUI container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your DockerUI instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/crosbymichael/dockerui/wiki/Dockerui-with-Nginx-HTTP-Auth). + + +Bind mounting the Unix socket into the UI For Docker container is much more secure than exposing your docker daemon over TCP. The `--privileged` flag is required for hosts using SELinux. You should still secure your UI For Docker instance behind some type of auth. Directions for using Nginx auth are [here](https://github.com/kevana/ui-for-docker/wiki/Dockerui-with-Nginx-HTTP-Auth). ### Specify socket to connect to Docker daemon -By default DockerUI connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`. +By default UI For Docker connects to the Docker daemon with`/var/run/docker.sock`. For this to work you need to bind mount the unix socket into the container with `-v /var/run/docker.sock:/var/run/docker.sock`. You can use the `-e` flag to change this socket: # Connect to a tcp socket: - $ docker run -d -p 9000:9000 --privileged dockerui/dockerui -e http://127.0.0.1:2375 + $ docker run -d -p 9000:9000 --privileged uifd/ui-for-docker -e http://127.0.0.1:2375 -### Change address/port DockerUI is served on -DockerUI listens on port 9000 by default. If you run DockerUI inside a container then you can bind the container's internal port to any external address and port: +### Change address/port UI For Docker is served on +UI For Docker listens on port 9000 by default. If you run UI For Docker inside a container then you can bind the container's internal port to any external address and port: - # Expose DockerUI on 10.20.30.1:80 - $ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock dockerui/dockerui + # Expose UI For Docker on 10.20.30.1:80 + $ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock uifd/ui-for-docker -### Check the [wiki](//github.com/crosbymichael/dockerui/wiki) for more info about using dockerui +### Check the [wiki](https://github.com/kevana/ui-for-docker/wiki) for more info about using UI For Docker ### Stack * [Angular.js](https://github.com/angular/angular.js) @@ -58,11 +53,11 @@ DockerUI listens on port 9000 by default. If you run DockerUI inside a container ### License - MIT -The DockerUI code is licensed under the MIT license. +The UI For Docker code is licensed under the MIT license. -**DockerUI:** -Copyright (c) 2014 Michael Crosby. crosbymichael.com +**UI For Docker:** +Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/app/app.js b/app/app.js index 9e7781e5e1072..49ae549929b39 100644 --- a/app/app.js +++ b/app/app.js @@ -1,5 +1,5 @@ -angular.module('dockerui', [ - 'dockerui.templates', +angular.module('uifordocker', [ + 'uifordocker.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', diff --git a/app/components/dashboard/dashboard.html b/app/components/dashboard/dashboard.html index b538eee3a7988..769d743fa58bb 100644 --- a/app/components/dashboard/dashboard.html +++ b/app/components/dashboard/dashboard.html @@ -5,7 +5,7 @@