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

Merge branch 'develop' into webpack

pull/2782/head
Anthony Lapenna 2019-03-13 15:28:06 +13:00
parent 26a6f3c237 3b8f982dbd
commit 18feb4ee95
7 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -1,4 +1,3 @@
<p align="center">
<img title="portainer" src='https://github.com/portainer/portainer/blob/develop/assets/images/logo_alt.png?raw=true' />
</p>
@ -11,10 +10,8 @@
[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=YHXZJQNJQ36H6)
**_Portainer_** is a lightweight management UI which allows you to **easily** manage your different Docker environments (Docker hosts or Swarm clusters).
**_Portainer_** is meant to be as **simple** to deploy as it is to use. It consists of a single container that can run on any Docker engine (can be deployed as Linux container or a Windows native container).
**_Portainer_** allows you to manage your Docker containers, images, volumes, networks and more ! It is compatible with the *standalone Docker* engine and with *Docker Swarm mode*.
**_Portainer_** is meant to be as **simple** to deploy as it is to use. It consists of a single container that can run on any Docker engine (can be deployed as Linux container or a Windows native container, supports other platforms too).
**_Portainer_** allows you to manage your all your Docker resources (containers, images, volumes, networks and more) ! It is compatible with the *standalone Docker* engine and with *Docker Swarm mode*.
## Demo

5
app/docker/views/containers/edit/container.html
View File

@ -84,10 +84,10 @@
<tr>
<td colspan="2">
<div class="btn-group" role="group" aria-label="...">
<a class="btn" type="button" ui-sref="docker.containers.container.stats({ id: container.Id })"><i class="fa fa-chart-area space-right" aria-hidden="true"></i>Stats</a>
<a class="btn" type="button" ui-sref="docker.containers.container.logs({ id: container.Id })"><i class="fa fa-file-alt space-right" aria-hidden="true"></i>Logs</a>
<a class="btn" type="button" ui-sref="docker.containers.container.console({ id: container.Id })"><i class="fa fa-terminal space-right" aria-hidden="true"></i>Console</a>
<a class="btn" type="button" ui-sref="docker.containers.container.inspect({ id: container.Id })"><i class="fa fa-info-circle space-right" aria-hidden="true"></i>Inspect</a>
<a class="btn" type="button" ui-sref="docker.containers.container.stats({ id: container.Id })"><i class="fa fa-chart-area space-right" aria-hidden="true"></i>Stats</a>
<a class="btn" type="button" ui-sref="docker.containers.container.console({ id: container.Id })"><i class="fa fa-terminal space-right" aria-hidden="true"></i>Console</a>
</div>
</td>
</tr>
@ -177,7 +177,6 @@
</rd-widget>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-xs-12">
<rd-widget>

4
app/docker/views/images/edit/image.html
View File

@ -1,4 +1,4 @@
<rd-header>
<rd-header>
<rd-header-title title-text="Image details"></rd-header-title>
<rd-header-content>
<a ui-sref="docker.images">Images</a> &gt; <a ui-sref="docker.images.image({id: image.Id})">{{ image.Id }}</a>
@ -180,8 +180,8 @@
</rd-widget-body>
</rd-widget>
</div>
</div>
</div>
<div class="row" ng-if="history.length > 0">
<div class="col-lg-12 col-md-12 col-xs-12">
<rd-widget>

16
app/index.html
View File

@ -1,9 +1,7 @@
<!DOCTYPE html>
<html lang="en" ng-app="<%= name %>">
<!DOCTYPE html><html lang="en" ng-app="<%= name %>">
<head>
<meta charset="utf-8">
<title>Portainer</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="<%= author %>">
@ -31,10 +29,10 @@
}"
ng-cloak>
<div id="sideview" ui-view="sidebar" ng-if="!applicationState.loading"></div>
<div id="content-wrapper">
<div class="page-content">
<div class="page-wrapper" ng-if="applicationState.loading">
<!-- loading box -->
<div class="container simple-box">
@ -55,12 +53,12 @@
</div>
<!-- !loading box -->
</div>
<!-- Main Content -->
<div id="view" ui-view="content" ng-if="!applicationState.loading"></div>
</div><!-- End Page Content -->
</div><!-- End Content Wrapper -->
</div><!-- End Page Wrapper -->
</body>
</html>
</body></html>

29
assets/css/app.css
View File

@ -11,31 +11,10 @@ html, body, #page-wrapper, #content-wrapper, .page-content, #view {
white-space: normal !important;
}
.messages {
max-height: 50px;
overflow-x: hidden;
overflow-y: scroll;
}
.legend .title {
padding: 0 0.3em;
margin: 0.5em;
border-style: solid;
border-width: 0 0 0 1em;
}
.logo {
display: inline;
max-width: 155px;
max-height: 55px;
}
.containerNameInput {
width: 85%;
border:none;
background:none;
border-bottom: 1px solid black;
}
.logo { display: inline; max-width: 155px; max-height: 55px; }
.legend .title { padding: 0 0.3em; margin: 0.5em; border-style: solid; border-width: 0 0 0 1em; }
.messages { max-height: 50px; overflow-x: hidden; overflow-y: scroll; }
.containerNameInput { width: 85%; border:none; background:none; border-bottom: 1px solid black; }
.containerNameInput:active, .containerNameInput:focus {
outline:none;

4
build/linux/Dockerfile
View File

@ -1,11 +1,7 @@
FROM portainer/base
COPY dist /
VOLUME /data
WORKDIR /
EXPOSE 9000
ENTRYPOINT ["/portainer"]

2
gruntfile.js
View File

@ -196,7 +196,7 @@ function shell_downloadDockerBinary(p, a) {
var ip = ((ps[p] === undefined) ? p : ps[p]);
var ia = ((as[a] === undefined) ? a : as[a]);
var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>'));
if (p === 'linux') {
if (p === 'linux' || p === 'mac') {
return [
'if [ -f dist/docker ]; then',
'echo "Docker binary exists";',