1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00
Commit graph

84 commits

Author SHA1 Message Date
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
Michael Crosby
b398ab96bd Merge pull request #10 from jpellerin/patch-1
Fix dockerui container instructions
2013-10-03 11:15:56 -07:00
Randy D. Wallace Jr
302e88cc78 Moved go installation to RUN from ADD 2013-10-03 02:50:08 +00:00
JP
8d34c1fff3 Fix dockerui container instructions
Remove `/dockerui` from command line -- not needed since that is set in the Dockerfile's ENTRYPOINT.
2013-10-02 16:39:48 -04:00
Randy D. Wallace Jr
cf018763bc Update Dockerfile to pull go from googlecode 2013-10-02 18:31:47 +00:00
Randy D. Wallace Jr
6dff5cd19e Update Dockerfile to build dockerui.go 2013-10-02 04:44:02 +00:00
Michael Crosby
31ac4ec91d Merge pull request #7 from crosbymichael/dev
Refactor dockerui.go
2013-09-11 13:24:20 -07:00
Michael Crosby
b3023e7e5e Refactor dockerui.go 2013-09-10 09:36:37 -07:00
Michael Crosby
d17adc0f9d Add missing files 2013-09-02 20:39:29 -07:00
Michael Crosby
9eaa75a572 Merge branch 'dev'
Conflicts:
	dockerui.go
2013-09-02 18:55:56 -07:00
Michael Crosby
007492b77d Update dockerfile and server 2013-09-02 18:55:00 -07:00
Michael Crosby
3ac9776585 Merge branch 'dashboard' into dev 2013-09-02 18:37:22 -07:00
Michael Crosby
dea7bfbc8f Add created chart for images and containers 2013-09-02 18:37:06 -07:00
Michael Crosby
847c2d570c Hide masthead after first load 2013-09-02 17:18:54 -07:00
Michael Crosby
ef3ec09cad Merge branch 'image-stats' into dev 2013-09-02 17:08:22 -07:00
Michael Crosby
3643525126 Change image chart sizes 2013-09-02 17:08:06 -07:00
Michael Crosby
de18a308c2 Add containers created 2013-09-02 16:54:53 -07:00
Michael Crosby
b1228a7439 Fix alignment and floats 2013-09-02 15:10:40 -07:00
Michael Crosby
1a3ace3fe3 Merge branch 'charts' into dev 2013-09-02 15:00:43 -07:00
Michael Crosby
7ae0b17573 Improve messages 2013-09-02 15:00:22 -07:00
Michael Crosby
0e41aec7f9 Add chart to dashboard 2013-09-02 14:51:35 -07:00
Michael Crosby
cfa8d3a442 Small bug fixes with new docker versions 2013-09-02 13:33:08 -07:00
Jonas Pfenniger
0baf3aead3 Allows to specify the path to the assets
Just in case
2013-09-02 13:33:08 -07:00
Michael Crosby
b4e8d0b46e Add growl files for notifications 2013-08-08 19:18:51 +00:00
Michael Crosby
c5c1776651 Merge pull request #3 from zimbatm/relative-assets
Relative assets for dockerui
2013-07-15 05:10:11 -07:00
Jonas Pfenniger
81187b904e Allows to specify the path to the assets
Just in case
2013-07-15 12:48:55 +01:00
Michael Crosby
f2b849fd85 Merge branch 'dev'
Dockerfile updates
2013-06-23 17:32:50 -09:00
Michael Crosby
81b1ee8174 Use sys link in dockerfile for app 2013-06-23 17:32:35 -09:00
Michael Crosby
fbf95ca3d7 Do not expose public port 2013-06-23 17:13:39 -09:00
Michael Crosby
55542e66ad Update port examples 2013-06-23 09:44:46 -09:00
Michael Crosby
5dc53c3abe Merge branch 'dev'
Conflicts:
	js/controllers.js
2013-06-23 09:34:19 -09:00
Michael Crosby
9672a33d63 Update readme with submodule msg 2013-06-23 09:30:43 -09:00
Michael Crosby
2e1918a330 Update readme for v02 2013-06-23 09:17:52 -09:00
Michael Crosby
95662bfd1a Merge branch 'server' into dev 2013-06-23 08:40:57 -09:00
Michael Crosby
40435f898f Update dockerfile and server for app dir 2013-06-23 08:38:48 -09:00
Michael Crosby
877effc6ad Add dockerui server files and Dockerfile 2013-06-22 10:10:22 -09:00
Michael Crosby
38f859f52d Update build and msg paritals 2013-06-22 09:23:25 -09:00
Michael Crosby
980bc6612e Merge branch 'create-containers' into dev 2013-06-19 18:13:37 -09:00
Michael Crosby
8aa21dcdf9 Add ace builds 2013-06-19 18:13:23 -09:00
Michael Crosby
be9a883800 Merge branch 'batch-actions' into create-containers 2013-06-19 18:12:07 -09:00
Michael Crosby
4b1eb96c78 Merge branch 'messages' into batch-actions 2013-06-19 18:11:38 -09:00
Michael Crosby
2e67fca780 Add global message display 2013-06-19 18:10:08 -09:00
Michael Crosby
37ea44a4dc Add message view and controller 2013-06-19 17:40:58 -09:00
Michael Crosby
dd8c4ce672 Add size and actions to container view 2013-06-19 12:39:33 -09:00
Michael Crosby
2d199eec5d Add container size 2013-06-19 12:18:54 -09:00
Michael Crosby
b069616da2 Add batch ops to images 2013-06-18 19:08:17 -09:00