github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity
1,429 Commits
497 Branches
146 Tags
110 MiB
Commit Graph

1429 Commits (3c6f6cf5bf00d7e8c4e24e7988c3efafdc043156)

Author SHA1 Message Date
Michael Crosby e3eb617be4 Merge pull request #37 from nazar-pc/master 
Added possibility to specify name at container creation
 2014-08-04 14:32:46 -07:00
Qiu Tiaoming 2d28a7d4c3 merge with my own master 2014-07-30 17:05:25 +08:00
Qiu Tiaoming 2329d73fca fix asserts path,rebase 2014-07-30 16:03:49 +08:00
Qiu Tiaoming 2ba51ac962 Revert "Revert "remove google CDN service,because sometimes you can not use google,especially you are in China"" 
This reverts commit 064b489fa5a5db0119b9af26fd23b1592cf2021c.
 2014-07-30 16:03:49 +08:00
Qiu Tiaoming a73baf46aa Revert "remove google CDN service,because sometimes you can not use google,especially you are in China" 
This reverts commit 9eb9e99122.
 2014-07-30 16:03:49 +08:00
Qiu Tiaoming c08f5f21d9 remove google CDN service,because sometimes you can not use google,especially you are in China 2014-07-30 16:03:49 +08:00
Nazar Mokrynskyi 98048dbb14 Merge pull request #1 from crosbymichael/master 
Rebase against master
 2014-07-29 23:40:24 +02:00
Nazar Mokrynskyi 29df9cf226 Added possibility to specify name at container creation 2014-07-28 22:39:39 +02:00
Michael Crosby 89a5b6e4f9 Merge pull request #33 from alafon/containerview-portbindings 
Display PortBindings instead of PortMapping in the /container view
 2014-07-28 12:03:50 -07:00
Michael Crosby 43922a7d26 Merge pull request #35 from zbbfufu/master 
Fixed Javascript/AngularJS problems
 2014-07-28 11:47:31 -07:00
FURGEROT Julien 56b009155c Fixed problems Javascript: 
- Declared js scripts in the head for faster loading
- Replaced absolute paths "/#/..." by "#/..." to keep work in a sub-url (http://www.exemple.com/dockerui/#/...)
- Fixed "ContainerController.hasContent" filter: a filter applies to individual elements, not to the array
 2014-07-25 17:48:42 +02:00
Qiu Tiaoming 9eb9e99122 remove google CDN service,because sometimes you can not use google,especially you are in China 2014-07-23 16:58:30 +08:00
Arnaud Lafon 1bbfdff369 Display PortBindings in the /container view 2014-07-18 12:48:08 +02:00
Michael Crosby 5075995129 Merge pull request #31 from homburg/feature-add-makefile 
Add Makefile
 2014-06-11 09:44:52 -07:00
Thomas B Homburg 46e8cbc918 Add makefile targets: build, run, open 2014-06-10 10:17:23 +02:00
Michael Crosby 2ac1049ebf Merge pull request #24 from schmichael/display-publish-ports 
Expose ExposedPorts and PublishAllPorts for containers
 2014-06-03 10:48:32 -07:00
Michael Crosby e38869f577 Merge pull request #26 from youribonnaffe/patch-1 
Default container is using port 9000
 2014-04-21 22:24:09 -07:00
Youri Bonnaffé 4d45891ef5 Default container is using port 9000 2014-04-13 12:06:29 +02:00
Michael Schurter be2346657e Expose ExposedPorts and PublishAllPorts for containers 2014-03-18 16:03:55 -07:00
Michael Crosby 6e4ef733ce Use crosbymichael/golang as base image 2014-03-15 11:56:16 -07:00
Michael Crosby 082d530c4d Merge pull request #22 from schmichael/default-socket 
Default endpoint to local unix socket
 2014-03-10 16:51:14 -07:00
Michael Schurter a76a2709f4 Default endpoint to local unix socket 2014-03-10 15:49:40 -07:00
Michael Crosby 79c64e8163 Merge pull request #20 from 42wim/fixdropdown 
use data-target instead of href (fixes dropdowns in latest chrome/firefo...
 2014-03-04 12:23:11 -05:00
Wim 78829d0b2e use data-target instead of href (fixes dropdowns in latest chrome/firefox) 2014-03-03 23:43:27 +01:00
Michael Crosby cb02a84226 Merge pull request #19 from gdi2290/patch-1 
update copyright year to range
 2014-03-01 00:31:43 -05:00
PatrickJS cca0376f5f update copyright year to range 2014-02-28 20:28:24 -08:00
Michael Crosby 759d260d2c Update readme to use the unix socket by default 2014-02-17 13:50:26 -08:00
Michael Crosby 09ce214ace Merge pull request #17 from crosbymichael/next 
Update angular and allow binding to a unix socket
 2014-02-14 23:38:51 -05:00
Michael Crosby b2a9108ade Add error for no socket 2014-02-14 20:38:07 -08:00
Michael Crosby c3850e4351 Remove update from dockerfile 2014-02-14 20:29:08 -08:00
Michael Crosby 49adc06c49 Add IP address and fix navigate to container 2014-01-07 09:40:23 -08:00
Michael Crosby aa1c15bcc0 Fix checkboxes with new angular version 2014-01-07 09:20:16 -08:00
Michael Crosby 172d32e276 Update readme with correct image 2014-01-02 19:32:35 -08:00
Michael Crosby 75d5bd1217 Allow a user to bind to a unix socket 2013-12-30 10:43:53 -08:00
Michael Crosby efd58156f7 Display container name on dashboard 2013-12-30 10:41:18 -08:00
Michael Crosby 0a6d413ebd Update angular to 1.2.7 
Also use CDN for angular source
 2013-12-30 10:41:18 -08:00
Michael Crosby d9db701ad8 Update modules and gitignore 2013-12-30 10:41:18 -08:00
Michael Crosby 15b272f29c Merge pull request #16 from cameronboehmer/master 
foolproof the quickstart instructions
 2013-12-30 09:38:18 -08:00
Cameron Boehmer a36c9ea0cd foolproof the quickstart instructions 2013-12-21 02:58:17 -08:00
Michael Crosby da8b8dd0a6 Merge pull request #15 from crosbymichael/next 
Update to api version 1.8 and add container names
 2013-12-16 13:42:55 -08:00
Michael Crosby a9dd55a720 Update to api version 1.8 2013-12-16 13:40:10 -08:00
Michael Crosby 27a9e97062 Fix images repo name 2013-12-13 10:26:58 -08:00
Michael Crosby a392c8ec87 Add name to container display 2013-12-13 10:16:40 -08:00
Michael Crosby e3f804ef88 Add container naming to container display 2013-12-13 10:05:35 -08:00
Michael Crosby 5094acc024 Merge pull request #14 from zimbatm/dokku-compat 
Makes dockerui compatible with dokku
 2013-12-13 10:04:03 -08:00
zimbatm 01f56a8ac4 Makes dockerui compatible with dokku 
These changes allow you to deploy dockerui to dokku.

All these changes are really to make the go buildpack happy.

Once pushed to dokku, configure docker to bind on the docker0 bridge :

```
ip a s docker0 | grep inet
=> inet 172.17.42.1/16 scope global docker0
echo 'DOCKER_OPTS="-H unix:///var/run/docker.sock -H tcp://172.17.42.1:4243 -api-enable-cors"' > /etc/default/docker
restart docker
dokku config:add dockerui DOCKER_ENDPOINT=http://172.17.42.1:4243
```
 2013-12-09 00:26:01 +00:00
Michael Crosby 2946a97f41 Merge pull request #11 from mcarr67/master 
Display PortMapping as opposed to PortSpec.
 2013-10-22 14:56:44 -07:00
Mike Carr f79e3b91ed Add 'or' to display either PortMapping or PortSpecs 2013-10-22 14:49:19 -07:00
Mike Carr 737af8a8d8 display PortMapping as opposed to PortSpec. 2013-10-19 12:11:53 -07:00
Michael Crosby 5cfb08b536 Merge pull request #9 from randywallace/update-dockerfile 
Update Dockerfile to build dockerui.go
 2013-10-03 11:34:41 -07:00