Merge pull request #76 from kevana/master

Fixes #75, HostConfig issues
pull/2/head v0.6.0
Kevan Ahlquist 10 years ago
commit ccd27f203d

@ -110,7 +110,9 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
var s = $scope;
Container.create(config, function(d) {
if (d.Id) {
ctor.start({id: d.Id}, function(cd) {
var reqBody = config.HostConfig || {};
reqBody.id = d.Id;
ctor.start(reqBody, function(cd) {
if (cd.id) {
Messages.send('Container Started', d.Id);
$('#create-modal').modal('hide');

8
dist/dockerui.js vendored

@ -1,6 +1,6 @@
/*! dockerui - v0.6.0 - 2015-01-31
/*! dockerui - v0.6.0 - 2015-02-01
* https://github.com/crosbymichael/dockerui
* Copyright (c) 2015 Michael Crosby;
* Copyright (c) 2015 Michael Crosby & Kevan Ahlquist;
* Licensed MIT
*/
angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
@ -613,7 +613,9 @@ function($scope, $routeParams, $location, Container, Messages, containernameFilt
var s = $scope;
Container.create(config, function(d) {
if (d.Id) {
ctor.start({id: d.Id}, function(cd) {
var reqBody = config.HostConfig || {};
reqBody.id = d.Id;
ctor.start(reqBody, function(cd) {
if (cd.id) {
Messages.send('Container Started', d.Id);
$('#create-modal').modal('hide');

2
dist/index.html vendored

@ -5,7 +5,7 @@
<title>DockerUI</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="Michael Crosby">
<meta name="author" content="Michael Crosby & Kevan Ahlquist">
<link href="assets/css/bootstrap.min.css" rel="stylesheet">
<link href="assets/css/jquery.gritter.css" rel="stylesheet">

@ -1,5 +1,5 @@
{
"author": "Michael Crosby",
"author": "Michael Crosby & Kevan Ahlquist",
"name": "dockerui",
"homepage": "https://github.com/crosbymichael/dockerui",
"version": "0.6.0",

Loading…
Cancel
Save