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

Merge branch "feat99-container-exec-event" into internal

pull/119/head
Anthony Lapenna 2016-08-03 21:31:32 +12:00
parent f4d90306b3 4a738ee362
commit 20eecffc40
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
api/ui-for-docker Executable file
View File

Binary file not shown.

2
app/app.js
View File

@ -154,4 +154,4 @@ angular.module('uifordocker', [
.constant('DOCKER_ENDPOINT', 'dockerapi') .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('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('CONFIG_ENDPOINT', 'settings') .constant('CONFIG_ENDPOINT', 'settings')
.constant('UI_VERSION', 'v1.5.0'); .constant('UI_VERSION', 'v1.5.0');

8
app/shared/viewmodel.js
View File

@ -58,7 +58,13 @@ function createEventDetails(event) {
details = 'Container ' + eventAttr.name + ' unpaused'; details = 'Container ' + eventAttr.name + ' unpaused';
break; break;
default: default:
details = 'Unsupported event'; if (event.Action.indexOf('exec_create') === 0) {
details = 'Exec instance created';
} else if (event.Action.indexOf('exec_start') === 0) {
details = 'Exec instance started';
} else {
details = 'Unsupported event';
}
} }
break; break;
case 'image': case 'image':