Add support for windows containers

naiiytom · Aug 11, 2017 · 30d7097 · 30d7097
1 parent 7f17a7e
commit 30d7097
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/provisioner/windows.go b/provisioner/windows.go
@@ -132,7 +132,7 @@ func (d *windows) InstanceDelete(session *types.Session, instance *types.Instanc
 	return nil
 }
 
-func (d *windows) InstanceResizeTerminal(instance *types.Instance, cols, rows uint) error {
+func (d *windows) InstanceResizeTerminal(instance *types.Instance, rows, cols uint) error {
 	dockerClient, err := d.factory.GetForSession(instance.SessionId)
 	if err != nil {
 		return err
@@ -172,7 +172,9 @@ func (d *windows) getWindowsInstanceInfo(sessionId string) (*instanceInfo, error
 	availInstances := make([]string, len(instances))
 
 	for i, inst := range instances {
-		availInstances[i] = *inst.InstanceId
+		if *inst.LifecycleState == "InService" {
+			availInstances[i] = *inst.InstanceId
+		}
 	}
 
 	assignedInstances, err := d.storage.InstanceGetAllWindows()

diff --git a/www/assets/app.js b/www/assets/app.js
@@ -27,6 +27,7 @@
     $scope.isAlive = true;
     $scope.ttl = '--:--:--';
     $scope.connected = true;
+    $scope.type = {windows: false};
     $scope.isInstanceBeingCreated = false;
     $scope.newInstanceBtnText = '+ Add new instance';
     $scope.deleteInstanceBtnText = 'Delete';
@@ -108,10 +109,11 @@
 
     $scope.newInstance = function() {
       updateNewInstanceBtnState(true);
+      var instanceType = $scope.type.windows ? 'windows': 'linux';
       $http({
         method: 'POST',
         url: '/sessions/' + $scope.sessionId + '/instances',
-        data : { ImageName : InstanceService.getDesiredImage() }
+        data : { ImageName : InstanceService.getDesiredImage(), type: instanceType }
       }).then(function(response) {
         var i = $scope.upsertInstance(response.data);
         $scope.showInstance(i);

diff --git a/www/index.html b/www/index.html
@@ -48,7 +48,12 @@ <h1 class="md-headline">No connection to server. Reconnecting...</h1>
                   <div class="md-toolbar-tools">
                     <h1 class="md-toolbar-tools">Instances</h1>
                     <templates-icon></templates-icon>
-                    <settings-icon></settings-icon>
+                    <settings-icon></settings-icon><br/>
+                  </div>
+                  <div class="md-toolbar-tools">
+                      <md-switch ng-disabled="instances.length > 0" ng-model="type.windows">
+                          Windows containers {{windows}}
+                      </md-switch>
                   </div>
                 </md-toolbar>
                 <md-content layout-padding>