diff --git a/.dockerignore b/.dockerignore index 5185ba50d..0d0d4f0c6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,2 @@ -node_modules -bower_components -.git -Dockerfile +* +!dist diff --git a/app/app.js b/app/app.js index 35dbcdea9..222d6decd 100644 --- a/app/app.js +++ b/app/app.js @@ -48,5 +48,5 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services' // You need to set this to the api endpoint without the port i.e. http://192.168.1.9 .constant('DOCKER_ENDPOINT', 'dockerapi') .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243 - .constant('UI_VERSION', 'v0.8.0') + .constant('UI_VERSION', 'v0.9.0-beta') .constant('DOCKER_API_VERSION', 'v1.20'); diff --git a/assets/ico/apple-touch-icon-114-precomposed.png b/assets/ico/apple-touch-icon-114-precomposed.png deleted file mode 100755 index 790a64f75..000000000 Binary files a/assets/ico/apple-touch-icon-114-precomposed.png and /dev/null differ diff --git a/assets/ico/apple-touch-icon-144-precomposed.png b/assets/ico/apple-touch-icon-144-precomposed.png deleted file mode 100755 index 6d0e463fd..000000000 Binary files a/assets/ico/apple-touch-icon-144-precomposed.png and /dev/null differ diff --git a/assets/ico/apple-touch-icon-57-precomposed.png b/assets/ico/apple-touch-icon-57-precomposed.png deleted file mode 100755 index 4936cca83..000000000 Binary files a/assets/ico/apple-touch-icon-57-precomposed.png and /dev/null differ diff --git a/assets/ico/apple-touch-icon-72-precomposed.png b/assets/ico/apple-touch-icon-72-precomposed.png deleted file mode 100755 index b1165bdbd..000000000 Binary files a/assets/ico/apple-touch-icon-72-precomposed.png and /dev/null differ diff --git a/assets/ico/apple-touch-icon-precomposed.png b/assets/ico/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..d326ea52b Binary files /dev/null and b/assets/ico/apple-touch-icon-precomposed.png differ diff --git a/assets/ico/favicon.ico b/assets/ico/favicon.ico old mode 100755 new mode 100644 index cb8dbdfc4..99f65e463 Binary files a/assets/ico/favicon.ico and b/assets/ico/favicon.ico differ diff --git a/bower.json b/bower.json index f71109f63..c60e45f35 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "dockerui", - "version": "0.8.0", + "version": "0.9.0-beta", "homepage": "https://github.com/crosbymichael/dockerui", "authors": [ "Michael Crosby ", diff --git a/examples/nginx-basic-auth/Dockerfile b/examples/nginx-basic-auth/Dockerfile new file mode 100644 index 000000000..3871e7779 --- /dev/null +++ b/examples/nginx-basic-auth/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:1.9.9 + +COPY default.conf /etc/nginx/conf.d/default.conf +COPY users.htpasswd /etc/nginx/users.htpasswd diff --git a/examples/nginx-basic-auth/default.conf b/examples/nginx-basic-auth/default.conf new file mode 100644 index 000000000..49d03c5ec --- /dev/null +++ b/examples/nginx-basic-auth/default.conf @@ -0,0 +1,17 @@ +upstream dockerui { + server dockerui:9000; +} + +server { + listen 80; + server_name localhost; + + location / { + auth_basic "Docker UI"; + auth_basic_user_file /etc/nginx/users.htpasswd; + + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_pass http://dockerui; + } +} diff --git a/examples/nginx-basic-auth/docker-compose.yml b/examples/nginx-basic-auth/docker-compose.yml new file mode 100644 index 000000000..793e69360 --- /dev/null +++ b/examples/nginx-basic-auth/docker-compose.yml @@ -0,0 +1,12 @@ +dockerui: + image: dockerui/dockerui + privileged: true + volumes: + - /var/run/docker.sock:/var/run/docker.sock + +nginx: + build: . + links: + - dockerui + ports: + - 80:80 diff --git a/examples/nginx-basic-auth/users.htpasswd b/examples/nginx-basic-auth/users.htpasswd new file mode 100644 index 000000000..37d4fa4e5 --- /dev/null +++ b/examples/nginx-basic-auth/users.htpasswd @@ -0,0 +1 @@ +user:{PLAIN}password diff --git a/index.html b/index.html index 8ddb3304e..ee09da7a3 100644 --- a/index.html +++ b/index.html @@ -22,10 +22,7 @@ - - - - + diff --git a/package.json b/package.json index c8b8bc8fd..c442651d7 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Michael Crosby & Kevan Ahlquist", "name": "dockerui", "homepage": "https://github.com/crosbymichael/dockerui", - "version": "0.8.0", + "version": "0.9.0-beta", "repository": { "type": "git", "url": "git@github.com:crosbymichael/dockerui.git"