github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #228 from portainer/chore218-portainer-org 

chore(global): replace CloudInovasi with Portainer.io
pull/241/head
Anthony Lapenna 2016-09-23 18:29:09 +12:00 committed by GitHub
parent 12e6e0557d 39909d774f
commit ced0746a81
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LICENSE
View File

@ -1,4 +1,4 @@
Portainer: Copyright (c) 2016 CloudInovasi Portainer: Copyright (c) 2016 Portainer.io
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
@ -18,7 +18,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE. SOFTWARE.
UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com), Anthony Lapenna (anthonylapenna at cloudinovasi dot id) UI For Docker: Copyright (c) 2013-2016 Michael Crosby (crosbymichael.com), Kevan Ahlquist (kevanahlquist.com), Anthony Lapenna (portainer.io)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

24
README.md
View File

@ -1,6 +1,6 @@
# Portainer # Portainer
[![Microbadger](https://images.microbadger.com/badges/image/cloudinovasi/portainer.svg)](http://microbadger.com/images/cloudinovasi/portainer "Image size") [![Microbadger](https://images.microbadger.com/badges/image/portainer/portainer.svg)](http://microbadger.com/images/portainer/portainer "Image size")
[![Gitter](https://badges.gitter.im/portainer/Lobby.svg)](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Gitter](https://badges.gitter.im/portainer/Lobby.svg)](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
Portainer is a web interface for the Docker remote API. Portainer is a web interface for the Docker remote API.
@ -18,7 +18,7 @@ The following Docker versions are supported:
### Quickstart ### Quickstart
1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer` 1. Run: `docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock portainer/portainer`
2. Open your browser to `http://<dockerd host ip>:9000` 2. Open your browser to `http://<dockerd host ip>:9000`
@ -34,12 +34,12 @@ You can use the `--host`, `-H` flags to change this socket:
``` ```
# Connect to a tcp socket: # Connect to a tcp socket:
$ docker run -d -p 9000:9000 cloudinovasi/portainer -H tcp://127.0.0.1:2375 $ docker run -d -p 9000:9000 portainer/portainer -H tcp://127.0.0.1:2375
``` ```
``` ```
# Connect to another unix socket: # Connect to another unix socket:
$ docker run -d -p 9000:9000 cloudinovasi/portainer -H unix:///path/to/docker.sock $ docker run -d -p 9000:9000 portainer/portainer -H unix:///path/to/docker.sock
``` ```
### Swarm support ### Swarm support
@ -50,7 +50,7 @@ You can access a specific view for you Swarm cluster by defining the `--swarm` f
``` ```
# Connect to a tcp socket and enable Swarm: # Connect to a tcp socket and enable Swarm:
$ docker run -d -p 9000:9000 cloudinovasi/portainer -H tcp://<SWARM_HOST>:<SWARM_PORT> --swarm $ docker run -d -p 9000:9000 portainer/portainer -H tcp://<SWARM_HOST>:<SWARM_PORT> --swarm
``` ```
*NOTE*: Due to Swarm not exposing information in a machine readable way, the app is bound to a specific version of Swarm at the moment. *NOTE*: Due to Swarm not exposing information in a machine readable way, the app is bound to a specific version of Swarm at the moment.
@ -60,7 +60,7 @@ Portainer listens on port 9000 by default. If you run Portainer inside a contain
``` ```
# Expose Portainer on 10.20.30.1:80 # Expose Portainer 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 cloudinovasi/portainer $ docker run -d -p 10.20.30.1:80:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock portainer/portainer
``` ```
### Access a Docker engine protected via TLS ### Access a Docker engine protected via TLS
@ -70,13 +70,13 @@ Ensure that you have access to the CA, the cert and the public key used to acces
These files will need to be named `ca.pem`, `cert.pem` and `key.pem` respectively. Store them somewhere on your disk and mount a volume containing these files inside the UI container: These files will need to be named `ca.pem`, `cert.pem` and `key.pem` respectively. Store them somewhere on your disk and mount a volume containing these files inside the UI container:
``` ```
$ docker run -d -p 9000:9000 cloudinovasi/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify $ docker run -d -p 9000:9000 portainer/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify
``` ```
You can also use the `--tlscacert`, `--tlscert` and `--tlskey` flags if you want to change the default path to the CA, certificate and key file respectively: You can also use the `--tlscacert`, `--tlscert` and `--tlskey` flags if you want to change the default path to the CA, certificate and key file respectively:
``` ```
$ docker run -d -p 9000:9000 cloudinovasi/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify --tlscacert /certs/myCa.pem --tlscert /certs/myCert.pem --tlskey /certs/myKey.pem $ docker run -d -p 9000:9000 portainer/portainer -v /path/to/certs:/certs -H https://my-docker-host.domain:2376 --tlsverify --tlscacert /certs/myCa.pem --tlscert /certs/myCert.pem --tlskey /certs/myKey.pem
``` ```
*Note*: Replace `/path/to/certs` to the path to the certificate files on your disk. *Note*: Replace `/path/to/certs` to the path to the certificate files on your disk.
@ -88,7 +88,7 @@ You can use the `--logo` flag to specify an URL to your own logo.
For example, using the Docker logo: For example, using the Docker logo:
``` ```
$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer --logo "https://www.docker.com/sites/all/themes/docker/assets/images/brand-full.svg" $ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock portainer/portainer --logo "https://www.docker.com/sites/all/themes/docker/assets/images/brand-full.svg"
``` ```
The custom logo will replace the Portainer logo in the UI. The custom logo will replace the Portainer logo in the UI.
@ -106,7 +106,7 @@ $ docker run -d --label owner=acme nginx
You can hide it in the view by starting the ui with: You can hide it in the view by starting the ui with:
``` ```
$ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock cloudinovasi/portainer -l owner=acme $ docker run -d -p 9000:9000 --privileged -v /var/run/docker.sock:/var/run/docker.sock portainer/portainer -l owner=acme
``` ```
### Reverse proxy configuration ### Reverse proxy configuration
@ -143,9 +143,9 @@ Replace `ADDRESS:PORT` with the Portainer container details.
You can specify an URL to your own templates (**Apps**) definitions using the `--templates` or `-t` flags. You can specify an URL to your own templates (**Apps**) definitions using the `--templates` or `-t` flags.
By default, CloudInovasi templates will be used (https://raw.githubusercontent.com/cloud-inovasi/ui-templates/master/templates.json). By default, the following templates will be used (https://raw.githubusercontent.com/portainer/templates/master/templates.json).
For more information about hosting your own template definition and the format, see: https://github.com/cloud-inovasi/ui-templates For more information about hosting your own template definition and the format, see: https://github.com/portainer/templates
### Available options ### Available options

4
api/main.go
View File

@ -1,4 +1,4 @@
package main // import "github.com/cloudinovasi/portainer" package main // import "github.com/portainer/portainer"
import ( import (
"gopkg.in/alecthomas/kingpin.v2" "gopkg.in/alecthomas/kingpin.v2"
@ -19,7 +19,7 @@ func main() {
swarm = kingpin.Flag("swarm", "Swarm cluster support").Default("false").Short('s').Bool() swarm = kingpin.Flag("swarm", "Swarm cluster support").Default("false").Short('s').Bool()
labels = pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l')) labels = pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l'))
logo = kingpin.Flag("logo", "URL for the logo displayed in the UI").String() logo = kingpin.Flag("logo", "URL for the logo displayed in the UI").String()
templates = kingpin.Flag("templates", "URL to the templates (apps) definitions").Default("https://raw.githubusercontent.com/cloud-inovasi/ui-templates/master/templates.json").Short('t').String() templates = kingpin.Flag("templates", "URL to the templates (apps) definitions").Default("https://raw.githubusercontent.com/portainer/templates/master/templates.json").Short('t').String()
) )
kingpin.Parse() kingpin.Parse()

4
bower.json
View File

@ -1,9 +1,9 @@
{ {
"name": "portainer", "name": "portainer",
"version": "1.8.1", "version": "1.8.1",
"homepage": "https://github.com/cloud-inovasi/portainer", "homepage": "https://github.com/portainer/portainer",
"authors": [ "authors": [
"Anthony Lapenna <anthony.lapenna@cloudinovasi.id>" "Anthony Lapenna <anthony.lapenna at gmail dot com>"
], ],
"description": "A web interface for the Docker Remote API.", "description": "A web interface for the Docker Remote API.",
"keywords": [ "keywords": [

2
examples/nginx-basic-auth/docker-compose.yml
View File

@ -1,5 +1,5 @@
portainer: portainer:
image: cloudinovasi/portainer image: portainer/portainer
command: -e http://<SWARM_HOST>:<SWARM_PORT> command: -e http://<SWARM_HOST>:<SWARM_PORT>
nginx: nginx:

4
index.html
View File

@ -71,8 +71,8 @@
</ul> </ul>
<div class="sidebar-footer"> <div class="sidebar-footer">
<div class="col-xs-12"> <div class="col-xs-12">
<a href="https://github.com/cloud-inovasi/portainer" target="_blank"> <a href="https://github.com/portainer/portainer" target="_blank">
<i class="fa fa-github" aria-hidden="true"></i> <i class="fa fa-github" aria-hidden="true"></i>
Portainer {{ uiVersion }} Portainer {{ uiVersion }}
</a> </a>
</div> </div>

10
package.json
View File

@ -1,19 +1,19 @@
{ {
"author": "Cloud Inovasi", "author": "Portainer.io",
"name": "portainer", "name": "portainer",
"homepage": "https://github.com/cloud-inovasi/portainer", "homepage": "http://portainer.io",
"version": "1.8.1", "version": "1.8.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:cloud-inovasi/portainer.git" "url": "git@github.com:portainer/portainer.git"
}, },
"bugs": { "bugs": {
"url": "https://github.com/cloud-inovasi/portainer/issues" "url": "https://github.com/portainer/portainer/issues"
}, },
"licenses": [ "licenses": [
{ {
"type": "MIT", "type": "MIT",
"url": "https://raw.githubusercontent.com/cloud-inovasi/portainer/develop/LICENSE" "url": "https://raw.githubusercontent.com/portainer/portainer/develop/LICENSE"
} }
], ],
"engines": { "engines": {